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 817a167416)
This commit is contained in:
committed by
android-build-team Robot
parent
b5179d5d0d
commit
82628aa571
@@ -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>
|
||||
|
||||
@@ -73,6 +73,9 @@ public class ScreenTimeoutSettingsTest {
|
||||
@Mock
|
||||
AdaptiveSleepPreferenceController mAdaptiveSleepPreferenceController;
|
||||
|
||||
@Mock
|
||||
AdaptiveSleepCameraStatePreferenceController mAdaptiveSleepCameraStatePreferenceController;
|
||||
|
||||
@Mock
|
||||
Preference mDisableOptionsPreference;
|
||||
|
||||
@@ -98,6 +101,8 @@ public class ScreenTimeoutSettingsTest {
|
||||
|
||||
mSettings.mAdaptiveSleepController = mAdaptiveSleepPreferenceController;
|
||||
mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController;
|
||||
mSettings.mAdaptiveSleepCameraStatePreferenceController =
|
||||
mAdaptiveSleepCameraStatePreferenceController;
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -37,7 +37,7 @@ public class CardPreferenceTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mContext.setTheme(R.style.PreferenceTheme);
|
||||
mContext.setTheme(R.style.SettingsPreferenceTheme);
|
||||
mCardPreference = new CardPreference(mContext);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user