commit 9efcb2e314f4c31de26cea629b03b436f7b84df1
author Mahaver Chopra <mahaver@google.com> Wed May 04 14:03:08 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 04 14:03:09 2016 +0000
tree a261400e14e237da71b3b49bf37d6cc7e37307a4
parent 832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0
parent bc18b40623316f308bc21dd78f840ade73b89257

Merge "More informative title while choosing work lock." into nyc-dev

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 74ec4bb..7382077 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -183,6 +183,13 @@
                 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) {