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

More renaming in DashboardFragment

Browse Source 
getPreferenceControllers() -> createPreferenceControllers() for the same
reason as in ag/3647936

Bug: 73668763
Test: robotests
Change-Id: I97670a91a2a38d1c844d1b9d37f4222c5e6f45a0
This commit is contained in:
Fan Zhang
2018-02-22 13:51:41 -08:00
parent aed8994f6f
commit f7843adabd
87 changed files with 110 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/security/EncryptionAndCredential.java
View File

@@ -53,7 +53,7 @@ public class EncryptionAndCredential extends DashboardFragment {
}
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
}

2
src/com/android/settings/security/LockscreenDashboardFragment.java
View File

@@ -76,7 +76,7 @@ public class LockscreenDashboardFragment extends DashboardFragment
}
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Lifecycle lifecycle = getLifecycle();
final LockScreenNotificationPreferenceController notificationController =

12
src/com/android/settings/security/SecuritySettings.java
View File

@@ -77,7 +77,7 @@ public class SecuritySettings extends DashboardFragment {
}
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(), this /* host*/);
}
@@ -86,11 +86,11 @@ public class SecuritySettings extends DashboardFragment {
*/
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (getPreferenceController(TrustAgentListPreferenceController.class)
if (use(TrustAgentListPreferenceController.class)
.handleActivityResult(requestCode, resultCode)) {
return;
}
if (getPreferenceController(LockUnificationPreferenceController.class)
if (use(LockUnificationPreferenceController.class)
.handleActivityResult(requestCode, resultCode, data)) {
return;
}
@@ -98,16 +98,16 @@ public class SecuritySettings extends DashboardFragment {
}
void launchConfirmDeviceLockForUnification() {
getPreferenceController(LockUnificationPreferenceController.class)
use(LockUnificationPreferenceController.class)
.launchConfirmDeviceLockForUnification();
}
void unifyUncompliantLocks() {
getPreferenceController(LockUnificationPreferenceController.class).unifyUncompliantLocks();
use(LockUnificationPreferenceController.class).unifyUncompliantLocks();
}
void updateUnificationPreference() {
getPreferenceController(LockUnificationPreferenceController.class).updateState(null);
use(LockUnificationPreferenceController.class).updateState(null);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

4
src/com/android/settings/security/screenlock/ScreenLockSettings.java
View File

@@ -60,7 +60,7 @@ public class ScreenLockSettings extends DashboardFragment
}
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
mLockPatternUtils = new LockPatternUtils(context);
return buildPreferenceControllers(context, this /* parent */, getLifecycle(),
mLockPatternUtils);
@@ -68,7 +68,7 @@ public class ScreenLockSettings extends DashboardFragment
@Override
public void onOwnerInfoUpdated() {
getPreferenceController(OwnerInfoPreferenceController.class).updateSummary();
use(OwnerInfoPreferenceController.class).updateSummary();
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,