PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply SettingsPreferenceTheme in Settings

Browse Source 
- 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
This commit is contained in:
Edgar Wang
2021-04-14 09:54:04 +08:00
parent c9cbe8a572
commit 817a167416
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/styles_preference.xml
View File

@@ -19,7 +19,7 @@
<!-- Things unrelated to preference framework UI customization should go to other styles files --> <!-- Things unrelated to preference framework UI customization should go to other styles files -->
<resources> <resources>
<style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase"> <style name="SettingsPreferenceTheme" parent="@style/PreferenceTheme.SettingsBase">
<item name="apnPreferenceStyle">@style/ApnPreference</item> <item name="apnPreferenceStyle">@style/ApnPreference</item>
<item name="cardPreferenceStyle">@style/CardPreference</item> <item name="cardPreferenceStyle">@style/CardPreference</item>
<item name="slicePreferenceStyle">@style/SlicePreference</item> <item name="slicePreferenceStyle">@style/SlicePreference</item>
@@ -28,7 +28,7 @@
<item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item> <item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
</style> </style>
<style name="PreferenceTheme.SetupWizard"> <style name="PreferenceTheme.SetupWizard" parent="@style/SettingsPreferenceTheme">
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item> <item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
<item name="preferenceStyle">@style/Preference.Material</item> <item name="preferenceStyle">@style/Preference.Material</item>
</style> </style>

3
res/values/themes.xml
View File

@@ -26,6 +26,7 @@
<style name="Theme.Settings" parent="Theme.SettingsBase"> <style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="android:clipToPadding">false</item> <item name="android:clipToPadding">false</item>
<item name="android:clipChildren">false</item> <item name="android:clipChildren">false</item>
<item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
<item name="android:listPreferredItemHeight">72dip</item> <item name="android:listPreferredItemHeight">72dip</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item> <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
<item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -207,7 +208,7 @@
<style name="Theme.Settings.HomeBase" parent="Theme.Settings.NoActionBar"> <style name="Theme.Settings.HomeBase" parent="Theme.Settings.NoActionBar">
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item> <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="colorAccent">@*android:color/accent_device_default_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 --> <!-- action bar, needed for search bar icon tinting -->
<item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar</item> <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar</item>

2
res/values/themes_suw.xml
View File

@@ -196,7 +196,7 @@
<item name="android:colorPrimary">@color/material_grey_100</item> <item name="android:colorPrimary">@color/material_grey_100</item>
<item name="android:colorAccent">@color/material_blue_700</item> <item name="android:colorAccent">@color/material_blue_700</item>
<item name="android:titleTextColor">@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> <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
</style> </style>

2
tests/robotests/res/values/themes.xml
View File

@@ -13,7 +13,7 @@
<item name="colorPrimary">#ffffff</item> <item name="colorPrimary">#ffffff</item>
<item name="colorPrimaryDark">#ffffff</item> <item name="colorPrimaryDark">#ffffff</item>
<item name="colorAccent">#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> <item name="android:windowLightStatusBar">true</item>
<!-- Define this color for material design --> <!-- Define this color for material design -->
<item name="colorPrimaryVariant">@android:color/white</item> <item name="colorPrimaryVariant">@android:color/white</item>

5
tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
View File

@@ -73,6 +73,9 @@ public class ScreenTimeoutSettingsTest {
@Mock @Mock
AdaptiveSleepPreferenceController mAdaptiveSleepPreferenceController; AdaptiveSleepPreferenceController mAdaptiveSleepPreferenceController;
@Mock
AdaptiveSleepCameraStatePreferenceController mAdaptiveSleepCameraStatePreferenceController;
@Mock @Mock
Preference mDisableOptionsPreference; Preference mDisableOptionsPreference;
@@ -98,6 +101,8 @@ public class ScreenTimeoutSettingsTest {
mSettings.mAdaptiveSleepController = mAdaptiveSleepPreferenceController; mSettings.mAdaptiveSleepController = mAdaptiveSleepPreferenceController;
mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController; mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController;
mSettings.mAdaptiveSleepCameraStatePreferenceController =
mAdaptiveSleepCameraStatePreferenceController;
} }
@Test @Test

2
tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
View File

@@ -37,7 +37,7 @@ public class CardPreferenceTest {
@Before @Before
public void setUp() { public void setUp() {
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mContext.setTheme(R.style.PreferenceTheme); mContext.setTheme(R.style.SettingsPreferenceTheme);
mCardPreference = new CardPreference(mContext); mCardPreference = new CardPreference(mContext);
} }