Add emergency theme for lock screen
Bug:27525102
Change-Id: Ic6e687691e0f11eac021ebd48a74a43d73ae8da5
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9404509..086d9c4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,10 +21,10 @@
<application
android:label="@string/app_label"
- android:theme="@style/AppTheme"
android:supportsRtl="true">
<activity
android:name=".ViewInfoActivity"
+ android:theme="@style/AppThemeEmergency"
android:showOnLockScreen="true">
<intent-filter>
<action android:name="android.telephony.action.EMERGENCY_ASSISTANCE" />
@@ -33,7 +33,8 @@
</activity>
<activity
- android:name=".EditInfoActivity">
+ android:name=".EditInfoActivity"
+ android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.settings.EDIT_EMERGENGY_INFO" />
<category android:name="android.intent.category.DEFAULT" />
@@ -42,7 +43,8 @@
<!-- TODO: Change the icon to the app's icon once ready -->
<activity
android:name=".SetupWizardEditInfoActivity"
- android:icon="@drawable/ic_menu_add_dark">
+ android:icon="@drawable/ic_menu_add_dark"
+ android:theme="@style/AppTheme">
<intent-filter android:priority="10">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.suggested.category.EMERGENCY_INFO" />
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
deleted file mode 100644
index dbbdd40..0000000
--- a/res/values-v21/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-
- <style name="AppTheme.NoActionBar">
- <item name="windowActionBar">false</item>
- <item name="windowNoTitle">true</item>
- <item name="android:windowDrawsSystemBarBackgrounds">true</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- </style>
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 0000000..31efc5b
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <color name="emergency_primary_dark">#C62828</color>
+ <color name="emergency_primary">#E53935</color>
+ <!--TODO: change this color to yellow #FFFF00 once we introduce tabs and remove categories -->
+ <color name="emergency_accent">#E53935</color>
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d1bf529..d5acf2e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -14,17 +14,13 @@
limitations under the License.
-->
<resources>
-
- <!-- Base application theme. -->
+ <!-- Base settings theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
</style>
-
- <style name="AppTheme.NoActionBar">
- <item name="windowActionBar">false</item>
+ <!-- Base emergency theme. -->
+ <style name="AppThemeEmergency" parent="AppTheme">
+ <item name="colorPrimaryDark">@color/emergency_primary_dark</item>
+ <item name="colorPrimary">@color/emergency_primary</item>
+ <item name="colorAccent">@color/emergency_accent</item>
</style>
-
- <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
- <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
</resources>