Remove DynamicAvailabilityPreferenceController.
- This class is over complex to use, and get in the way of show/hide pref when availability change. - The function from DynamicAvailabilityPreferenceController can be done with PreferenceCategoryController. Bug: 68956750 Bug: 32953042 Test: robotests Change-Id: Ia7b7e214c072b8c77f5de3d959fdb1dc79217f76
This commit is contained in:
@@ -206,7 +206,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
|
||||
mManageDeviceAdminPreferenceController
|
||||
= new ManageDeviceAdminPreferenceController(activity);
|
||||
mEnterprisePrivacyPreferenceController
|
||||
= new EnterprisePrivacyPreferenceController(activity, null /* lifecycle */);
|
||||
= new EnterprisePrivacyPreferenceController(activity);
|
||||
mLockScreenNotificationPreferenceController
|
||||
= new LockScreenNotificationPreferenceController(activity);
|
||||
}
|
||||
@@ -400,7 +400,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
|
||||
mManageDeviceAdminPreferenceController.updateState(
|
||||
root.findPreference(KEY_MANAGE_DEVICE_ADMIN));
|
||||
mEnterprisePrivacyPreferenceController.displayPreference(root);
|
||||
mEnterprisePrivacyPreferenceController.onResume();
|
||||
final Preference enterprisePrivacyPreference = root.findPreference(
|
||||
mEnterprisePrivacyPreferenceController.getPreferenceKey());
|
||||
mEnterprisePrivacyPreferenceController.updateState(enterprisePrivacyPreference);
|
||||
|
||||
return root;
|
||||
}
|
||||
@@ -893,7 +895,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
|
||||
keys.add(KEY_MANAGE_TRUST_AGENTS);
|
||||
}
|
||||
|
||||
if (!(new EnterprisePrivacyPreferenceController(context, null /* lifecycle */))
|
||||
if (!(new EnterprisePrivacyPreferenceController(context))
|
||||
.isAvailable()) {
|
||||
keys.add(KEY_ENTERPRISE_PRIVACY);
|
||||
}
|
||||
|
Reference in New Issue
Block a user