Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314
am: b735c1baf7
* commit 'b735c1baf7affe1bc26ce6be3abe605026f828e2':
More informative title while choosing work lock.
Change-Id: I56a16ff55bf5c84ccecafb1f6e8d958fbe0890b0
This commit is contained in:
@@ -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) {
|
||||
|
Reference in New Issue
Block a user