Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "hub-mode-settings" into tm-qpr-dev

Browse Source 
* changes:
  Add top-level Communal settings.
  Change screensaver ctrlr to base pref ctrlr.
This commit is contained in:
Darrell Shi
2022-12-21 08:03:49 +00:00
committed by Android (Google) Code Review
parent 0ce477d1b0 65836b1e3d
commit e722587923
13 changed files with 164 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
View File

@@ -45,11 +45,13 @@ public class ScreenSaverPreferenceControllerTest {
private ScreenSaverPreferenceController mController;
private final String mPrefKey = "test_screensaver";
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mController = new ScreenSaverPreferenceController(mContext);
mController = new ScreenSaverPreferenceController(mContext, mPrefKey);
when(mContext.getResources()).thenReturn(mResources);
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);