diff options
| author | Sungmin Choi <sungmin.choi@lge.com> | 2015-07-31 02:03:52 -0700 |
|---|---|---|
| committer | Thierry Strudel <tstrudel@google.com> | 2015-09-02 13:51:44 -0700 |
| commit | 05c7dde1f3a6044db7b687dfcbacbde50f3befb1 (patch) | |
| tree | b5ab54b0ce0f839d817cad22bdcff862da442435 /src/com/android/settings/ChooseLockGeneric.java | |
| parent | e182fa77888d0b42b4896f031e7b1d8c88a62a4c (diff) | |
| download | packages_apps_Settings-05c7dde1f3a6044db7b687dfcbacbde50f3befb1.zip packages_apps_Settings-05c7dde1f3a6044db7b687dfcbacbde50f3befb1.tar.gz packages_apps_Settings-05c7dde1f3a6044db7b687dfcbacbde50f3befb1.tar.bz2 | |
To hide none security option, use config_hide_none_security_option config
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.
Bug: 22209425
Bug: 22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
Diffstat (limited to 'src/com/android/settings/ChooseLockGeneric.java')
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 94a9de5..8c0b0b6 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -361,6 +361,10 @@ public class ChooseLockGeneric extends SettingsActivity { boolean visible = true; if (KEY_UNLOCK_SET_OFF.equals(key)) { enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; + if (getResources().getBoolean(R.bool.config_hide_none_security_option)) { + enabled = false; + visible = false; + } } else if (KEY_UNLOCK_SET_NONE.equals(key)) { enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) { |