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

Merge "Show unification option only when it will result in a compliant lock"

Browse Source
This commit is contained in:
Clara Bayarri
2016-01-27 10:59:09 +00:00
committed by Android (Google) Code Review
parent a8d2fb4a6a d3ca4fb300
commit 40c0bf3ffc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/ProfileChallengePreferenceFragment.java
View File

@@ -238,7 +238,8 @@ public class ProfileChallengePreferenceFragment extends SettingsPreferenceFragme
private void maybeAddUnificationPreference(PreferenceGroup securityCategory) { private void maybeAddUnificationPreference(PreferenceGroup securityCategory) {
if (mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileUserId) if (mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileUserId)
>= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) { >= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
&& mLockPatternUtils.isSeparateProfileChallengeAllowedToUnify(mProfileUserId)) {
Preference unificationPreference = new Preference(securityCategory.getContext()); Preference unificationPreference = new Preference(securityCategory.getContext());
unificationPreference.setKey(KEY_UNIFICATION); unificationPreference.setKey(KEY_UNIFICATION);
unificationPreference.setTitle(R.string.lock_settings_profile_unification_title); unificationPreference.setTitle(R.string.lock_settings_profile_unification_title);