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

Merge "Put Security-related controllers into a PreferenceCategoryController."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-21 01:08:31 +00:00
committed by Android (Google) Code Review
parent 3befdd2c54 7d5a53f03c
commit 46b8ef9b7a
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,8 @@ import java.util.List;
public class SecuritySettings extends DashboardFragment { public class SecuritySettings extends DashboardFragment {
private static final String TAG = "SecuritySettings"; private static final String TAG = "SecuritySettings";
private static final String SECURITY_CATEGORY = "security_category";
private static final String WORK_PROFILE_SECURITY_CATEGORY = "security_category_profile";
public static final int CHANGE_TRUST_AGENT_SETTINGS = 126; public static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
public static final int UNIFY_LOCK_CONFIRM_DEVICE_REQUEST = 128; public static final int UNIFY_LOCK_CONFIRM_DEVICE_REQUEST = 128;
@@ -118,12 +120,17 @@ public class SecuritySettings extends DashboardFragment {
controllers.add(new ScreenPinningPreferenceController(context)); controllers.add(new ScreenPinningPreferenceController(context));
controllers.add(new SimLockPreferenceController(context)); controllers.add(new SimLockPreferenceController(context));
controllers.add(new ShowPasswordPreferenceController(context)); controllers.add(new ShowPasswordPreferenceController(context));
controllers.add(new FingerprintStatusPreferenceController(context));
controllers.add(new EncryptionStatusPreferenceController(context, controllers.add(new EncryptionStatusPreferenceController(context,
PREF_KEY_ENCRYPTION_SECURITY_PAGE)); PREF_KEY_ENCRYPTION_SECURITY_PAGE));
controllers.add(new TrustAgentListPreferenceController(context, host, lifecycle)); controllers.add(new TrustAgentListPreferenceController(context, host, lifecycle));
controllers.add(new LockScreenPreferenceController(context, lifecycle));
controllers.add(new ChangeScreenLockPreferenceController(context, host)); final List<AbstractPreferenceController> securityPreferenceControllers = new ArrayList<>();
securityPreferenceControllers.add(new FingerprintStatusPreferenceController(context));
securityPreferenceControllers.add(new LockScreenPreferenceController(context, lifecycle));
securityPreferenceControllers.add(new ChangeScreenLockPreferenceController(context, host));
controllers.add(new PreferenceCategoryController(context, SECURITY_CATEGORY,
securityPreferenceControllers));
controllers.addAll(securityPreferenceControllers);
final List<AbstractPreferenceController> profileSecurityControllers = new ArrayList<>(); final List<AbstractPreferenceController> profileSecurityControllers = new ArrayList<>();
profileSecurityControllers.add(new ChangeProfileScreenLockPreferenceController( profileSecurityControllers.add(new ChangeProfileScreenLockPreferenceController(
@@ -132,7 +139,7 @@ public class SecuritySettings extends DashboardFragment {
profileSecurityControllers.add(new VisiblePatternProfilePreferenceController( profileSecurityControllers.add(new VisiblePatternProfilePreferenceController(
context, lifecycle)); context, lifecycle));
profileSecurityControllers.add(new FingerprintProfileStatusPreferenceController(context)); profileSecurityControllers.add(new FingerprintProfileStatusPreferenceController(context));
controllers.add(new PreferenceCategoryController(context, "security_category_profile", controllers.add(new PreferenceCategoryController(context, WORK_PROFILE_SECURITY_CATEGORY,
profileSecurityControllers)); profileSecurityControllers));
controllers.addAll(profileSecurityControllers); controllers.addAll(profileSecurityControllers);