Revert "Show "Add users from lock screen" dependent on secure lock screen."
This reverts commit 0149363a39
.
Reason for revert: Droidcop: Potential culprit for Bug 149209670- verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: Ia1f1ce35ef5d93664cf665bea86a472376b84aab
This commit is contained in:
@@ -240,7 +240,7 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
}
|
||||
|
||||
mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(
|
||||
activity, KEY_ADD_USER_WHEN_LOCKED, new LockPatternUtils(getPrefContext()));
|
||||
activity, KEY_ADD_USER_WHEN_LOCKED);
|
||||
mMultiUserFooterPreferenceController = new MultiUserFooterPreferenceController(activity,
|
||||
KEY_MULTIUSER_FOOTER);
|
||||
|
||||
@@ -1290,8 +1290,7 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
boolean suppressAllPage) {
|
||||
final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId,
|
||||
suppressAllPage);
|
||||
new AddUserWhenLockedPreferenceController(
|
||||
context, KEY_ADD_USER_WHEN_LOCKED, new LockPatternUtils(context))
|
||||
new AddUserWhenLockedPreferenceController(context, KEY_ADD_USER_WHEN_LOCKED)
|
||||
.updateNonIndexableKeys(niks);
|
||||
new AutoSyncDataPreferenceController(context, null /* parent */)
|
||||
.updateNonIndexableKeys(niks);
|
||||
|
Reference in New Issue
Block a user