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

Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev

Browse Source 
am: 00fb7a5598

* commit '00fb7a559815f73f15f8e1ddd697f6ceca5ade1b':
  When un-unifying the personal and work locks, launch lock setup
This commit is contained in:
Clara Bayarri
2016-03-01 23:29:24 +00:00
committed by android-build-merger
parent 0f13792953 00fb7a5598
commit b78f20354e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -702,7 +702,12 @@ public class SecuritySettings extends SettingsPreferenceFragment
dialog.show(getChildFragmentManager(), TAG_UNIFICATION_DIALOG); dialog.show(getChildFragmentManager(), TAG_UNIFICATION_DIALOG);
} else { } else {
mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, true); mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, true);
createPreferenceHierarchy(); Bundle extras = new Bundle();
extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
startFragment(this,
"com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
R.string.lock_settings_picker_title_profile,
SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE, extras);
} }
} else if (KEY_SHOW_PASSWORD.equals(key)) { } else if (KEY_SHOW_PASSWORD.equals(key)) {
Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD, Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,