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

Merge "Refactor some Preference Controllers to use BasePreferenceController"

Browse Source
This commit is contained in:
Yuri Ufimtsev
2022-01-10 14:48:13 +00:00
committed by Android (Google) Code Review
parent 6649b9b0eb cdc2677cd1
commit 2e8a9b292d
11 changed files with 33 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
View File

@@ -46,7 +46,7 @@ public class ScreenPinningPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new ScreenPinningPreferenceController(mContext);
mController = new ScreenPinningPreferenceController(mContext, "key");
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
}

2
tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
View File

@@ -77,7 +77,7 @@ public class SimLockPreferenceControllerTest {
shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager);
shadowApplication.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
mContext = RuntimeEnvironment.application;
mController = new SimLockPreferenceController(mContext);
mController = new SimLockPreferenceController(mContext, "key");
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);

2
tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
View File

@@ -64,7 +64,7 @@ public class ManageTrustAgentsPreferenceControllerTest {
.thenReturn(mLockPatternUtils);
when(mFeatureFactory.securityFeatureProvider.getTrustAgentManager())
.thenReturn(mTrustAgentManager);
mController = new ManageTrustAgentsPreferenceController(mContext);
mController = new ManageTrustAgentsPreferenceController(mContext, "key");
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
}