Apply SettingsPreferenceTheme in Settings
- Set all of preference style inherit from SettingsPreferenceTheme
- Apply to Theme.Settings and Theme.Settings.Home
- Fix robotest failed in ScreenTimeoutSettingsTest
Bug: 185206291
Test: manual & robotest
Change-Id: I855d003b10348569903855fcbf235bc00265658b
(cherry picked from commit 817a167416eecfa6f6455e94f31ffc9ff59ea0a4)
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 6453458..c162fc4 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -19,7 +19,7 @@
<!-- Things unrelated to preference framework UI customization should go to other styles files -->
<resources>
- <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
+ <style name="SettingsPreferenceTheme" parent="@style/PreferenceTheme.SettingsBase">
<item name="apnPreferenceStyle">@style/ApnPreference</item>
<item name="cardPreferenceStyle">@style/CardPreference</item>
<item name="slicePreferenceStyle">@style/SlicePreference</item>
@@ -28,7 +28,7 @@
<item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
</style>
- <style name="PreferenceTheme.SetupWizard">
+ <style name="PreferenceTheme.SetupWizard" parent="@style/SettingsPreferenceTheme">
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
<item name="preferenceStyle">@style/Preference.Material</item>
</style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4df4a78..444ec72 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -26,6 +26,7 @@
<style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="android:clipToPadding">false</item>
<item name="android:clipChildren">false</item>
+ <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
<item name="android:listPreferredItemHeight">72dip</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
@@ -207,7 +208,7 @@
<style name="Theme.Settings.HomeBase" parent="Theme.Settings.NoActionBar">
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="colorAccent">@*android:color/accent_device_default_light</item>
- <item name="preferenceTheme">@style/PreferenceTheme</item>
+ <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
<!-- action bar, needed for search bar icon tinting -->
<item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar</item>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index b286a51..deed9c6 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -196,7 +196,7 @@
<item name="android:colorPrimary">@color/material_grey_100</item>
<item name="android:colorAccent">@color/material_blue_700</item>
<item name="android:titleTextColor">@color/material_blue_700</item>
- <item name="preferenceTheme">@style/PreferenceTheme</item>
+ <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
</style>
diff --git a/tests/robotests/res/values/themes.xml b/tests/robotests/res/values/themes.xml
index 92edb17..0fe6328 100644
--- a/tests/robotests/res/values/themes.xml
+++ b/tests/robotests/res/values/themes.xml
@@ -13,7 +13,7 @@
<item name="colorPrimary">#ffffff</item>
<item name="colorPrimaryDark">#ffffff</item>
<item name="colorAccent">#ffffff</item>
- <item name="preferenceTheme">@style/PreferenceTheme</item>
+ <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
<item name="android:windowLightStatusBar">true</item>
<!-- Define this color for material design -->
<item name="colorPrimaryVariant">@android:color/white</item>
diff --git a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
index 771a863..c4f5580 100644
--- a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
@@ -74,6 +74,9 @@
AdaptiveSleepPreferenceController mAdaptiveSleepPreferenceController;
@Mock
+ AdaptiveSleepCameraStatePreferenceController mAdaptiveSleepCameraStatePreferenceController;
+
+ @Mock
Preference mDisableOptionsPreference;
@Before
@@ -98,6 +101,8 @@
mSettings.mAdaptiveSleepController = mAdaptiveSleepPreferenceController;
mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController;
+ mSettings.mAdaptiveSleepCameraStatePreferenceController =
+ mAdaptiveSleepCameraStatePreferenceController;
}
@Test
diff --git a/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
index 7304897..6d4a6bb 100644
--- a/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
@@ -37,7 +37,7 @@
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mContext.setTheme(R.style.PreferenceTheme);
+ mContext.setTheme(R.style.SettingsPreferenceTheme);
mCardPreference = new CardPreference(mContext);
}
