From 4a91408698c8fdf24868c115b7612c37dd00691c Mon Sep 17 00:00:00 2001 From: Clara Bayarri Date: Mon, 29 Feb 2016 17:57:56 -0800 Subject: [PATCH] When un-unifying the personal and work locks, launch lock setup When the user decides to have a separate work lock, it makes sense to send them to set up that lock directly. Also fixes the issue where we have work fingerprints in a unified state and un-unifying leaves the work profile with no lock but fingerprints. Bug: 27199237 Change-Id: I85dab9cdf993af69a661d8f0cd4ad2449a348cac --- src/com/android/settings/SecuritySettings.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 896697414bd..eb781e46343 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -702,7 +702,12 @@ public class SecuritySettings extends SettingsPreferenceFragment dialog.show(getChildFragmentManager(), TAG_UNIFICATION_DIALOG); } else { mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, true); - createPreferenceHierarchy(); + Bundle extras = new Bundle(); + extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId); + startFragment(this, + "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment", + R.string.lock_settings_picker_title_profile, + SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE, extras); } } else if (KEY_SHOW_PASSWORD.equals(key)) { Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,