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

2016-05-04 14:03:08 +00:00
parent 832c8e4fda bc18b40623
commit 9efcb2e314
1 changed files with 7 additions and 0 deletions
--- 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) {