PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314 am: b735c1baf7

Browse Source 
am: 1ebe441ae2

* commit '1ebe441ae2d35579705e79b63ece3dab6a045962':
  More informative title while choosing work lock.

Change-Id: I29a0a8e613954716b09746b4b15328fd9c184d38
This commit is contained in:
Mahaver Chopra
2016-05-04 14:45:01 +00:00
committed by android-build-merger
parent f4d22462ae 1ebe441ae2
commit 168122bec1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -183,6 +183,13 @@ public class ChooseLockGeneric extends SettingsActivity {
mUserId = targetUser; 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); mManagedPasswordProvider = ManagedLockPasswordProvider.get(getActivity(), mUserId);
if (mPasswordConfirmed) { if (mPasswordConfirmed) {