Option to hide swipe method

Bug: 27502832
Change-Id: Ia61b63279fa6f831fdfa9209747b0cbcbf807d50
This commit is contained in:
Evan Rosky
2016-06-10 12:15:22 -07:00
parent e81fec8489
commit bb70e4f696
2 changed files with 11 additions and 3 deletions

View File

@@ -41,6 +41,9 @@
<!-- Whether none security option is hide or not (country specific). --> <!-- Whether none security option is hide or not (country specific). -->
<bool name="config_hide_none_security_option">false</bool> <bool name="config_hide_none_security_option">false</bool>
<!-- Whether swipe security option is hidden or not -->
<bool name="config_hide_swipe_security_option">false</bool>
<!--Whether the storage manager exists. --> <!--Whether the storage manager exists. -->
<bool name="config_has_storage_manager">false</bool> <bool name="config_has_storage_manager">false</bool>
</resources> </resources>

View File

@@ -461,11 +461,16 @@ public class ChooseLockGeneric extends SettingsActivity {
disabledByAdmin = adminEnforcedQuality disabledByAdmin = adminEnforcedQuality
> DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; > DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
} else if (KEY_UNLOCK_SET_NONE.equals(key)) { } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
if (getResources().getBoolean(R.bool.config_hide_swipe_security_option)) {
enabled = false;
visible = false;
} else {
if (mUserId != UserHandle.myUserId()) { if (mUserId != UserHandle.myUserId()) {
// Swipe doesn't make sense for profiles. // Swipe doesn't make sense for profiles.
visible = false; visible = false;
} }
enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
}
disabledByAdmin = adminEnforcedQuality disabledByAdmin = adminEnforcedQuality
> DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; > DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
} else if (KEY_UNLOCK_SET_PATTERN.equals(key)) { } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {