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

Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev am: 9d14071637

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182152

Change-Id: Ic913f3883f6bbd985e6b1f7371ad47c52089d850
This commit is contained in:
Edgar Wang
2021-04-15 05:45:52 +00:00
committed by Automerger Merge Worker
parent fdfe60d87e 9d14071637
commit 7c3775b03d
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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);
}