From bc18b40623316f308bc21dd78f840ade73b89257 Mon Sep 17 00:00:00 2001 From: Mahaver Chopra Date: Wed, 4 May 2016 13:11:17 +0100 Subject: [PATCH] More informative title while choosing work lock. When Intent ACTION_SET_NEW_PASSWORD is called from a managed profile, ChooseLockGeneric fragment shows title "Unlock Selection", update that to "Choose work lock". Bug: 28451356 Change-Id: I9bcf4698557fa453337aa666f10f94f15e7624fa --- src/com/android/settings/ChooseLockGeneric.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 74ec4bba1aa..73820776828 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -183,6 +183,13 @@ public class ChooseLockGeneric extends SettingsActivity { mUserId = targetUser; } + if (DevicePolicyManager.ACTION_SET_NEW_PASSWORD + .equals(getActivity().getIntent().getAction()) + && Utils.isManagedProfile(UserManager.get(getActivity()), mUserId) + && mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) { + getActivity().setTitle(R.string.lock_settings_picker_title_profile); + } + mManagedPasswordProvider = ManagedLockPasswordProvider.get(getActivity(), mUserId); if (mPasswordConfirmed) {