Separate CBSActivity theme from CBListActivity theme
CBSActivity (WEA settings) now uses CellBroadcastSettingsTheme and
CBListActivity (the list of past cell broadcasts) now uses
CellBroadcastListActivityTheme.
Bug: 161731330
Test: manual
Change-Id: Ic718e9e510112c5f33051f522cbb2ef372f4d13b
Merged-In: Ic718e9e510112c5f33051f522cbb2ef372f4d13b
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d3c6ebe..d1c9d59 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -72,7 +72,7 @@
<activity android:name="com.android.cellbroadcastreceiver.CellBroadcastListActivity"
android:label="@string/app_label"
- android:theme="@style/CellBroadcastSettingsTheme"
+ android:theme="@style/CellBroadcastListActivityTheme"
android:configChanges="orientation|keyboardHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/RROSampleTestApp/res/values/themes.xml b/RROSampleTestApp/res/values/themes.xml
new file mode 100644
index 0000000..95de137
--- /dev/null
+++ b/RROSampleTestApp/res/values/themes.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2019 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>
+ <!--RED-->
+ <style name="CellBroadcastListActivityTheme">
+ <item name="android:colorPrimary">#FFDB4437</item>
+ <item name="android:colorSecondary">#FFDB4437</item>
+ <item name="android:colorAccent">#FFDB4437</item>
+ <item name="android:colorError">#FFDB4437</item>
+ <item name="android:colorPrimaryDark">#FFDB4437</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
+ <item name="android:windowShowWallpaper">true</item>
+ <item name="android:statusBarColor">#FFDB4437</item>
+ <item name="android:navigationBarColor">#FFDB4437</item>
+ <item name="android:textColor">#FFDB4437</item>
+ </style>
+
+ <!--BLUE-->
+ <style name="CellBroadcastSettingsTheme">
+ <item name="android:colorPrimary">#FF377CDB</item>
+ <item name="android:colorSecondary">#FF377CDB</item>
+ <item name="android:colorAccent">#FF377CDB</item>
+ <item name="android:colorError">#FF377CDB</item>
+ <item name="android:colorPrimaryDark">#FF377CDB</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
+ <item name="android:windowShowWallpaper">true</item>
+ <item name="android:statusBarColor">#FF377CDB</item>
+ <item name="android:navigationBarColor">#FF377CDB</item>
+ <item name="android:textColor">#FF377CDB</item>
+ </style>
+</resources>
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index b1be57b..fbfee87 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -23,7 +23,7 @@
<policy type="product|system|vendor">
<!-- START THEME / STYLE -->
<item type="style" name="CellBroadcastAlertTheme"/>
- <item type="style" name="PreferenceTheme"/>
+ <item type="style" name="CellBroadcastListActivityTheme"/>
<item type="style" name="CellBroadcastSettingsTheme"/>
<!-- END THEME / STYLE -->
@@ -63,4 +63,4 @@
</overlayable>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 2028aa5..059c72f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -21,15 +21,14 @@
<resources>
<style name="CellBroadcastAlertTheme" parent="android:Theme.DeviceDefault.Light.Dialog" />
- <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
+ <style name="CellBroadcastSettingsTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
<item name="switchPreferenceStyle">@style/SettingsSwitchPreference</item>
<item name="preferenceCategoryStyle">@style/Preference.Category.Material</item>
<item name="preferenceStyle">@style/SettingsPreference</item>
<item name="dialogPreferenceStyle">@style/SettingsDialogPreference</item>
</style>
- <style name="CellBroadcastSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
- <item name="preferenceTheme">@style/PreferenceTheme</item>
+ <style name="CellBroadcastListActivityTheme" parent="@android:style/Theme.DeviceDefault.Settings">
</style>
</resources>
