Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00fb7a55 authored by Clara Bayarri's avatar Clara Bayarri Committed by Android (Google) Code Review
Browse files

Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev

parents c9a8abb5 4a914086

src/com/android/settings/SecuritySettings.java

+6 −1
Original line number Diff line number Diff line
@@ -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,