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

am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config

Browse Source 
* commit 'e31208ae1c253b35edd34192f49c14a59bbd8c13':
  To hide none security option, use config_hide_none_security_option config
This commit is contained in:
Sungmin Choi
2015-09-02 21:25:25 +00:00
committed by Android Git Automerger
parent 532ebb9f7a e31208ae1c
commit a43a40ffe7
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/values-mcc505/bools.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Whether none security option is hide or not (country specific). -->
<bool name="config_hide_none_security_option">true</bool>
</resources>

3
res/values/bools.xml
View File

@@ -35,4 +35,7 @@
<!-- Whether to show a preference item for mobile plan -->
<bool name="config_show_mobile_plan">true</bool>
<!-- Whether none security option is hide or not (country specific). -->
<bool name="config_hide_none_security_option">false</bool>
</resources>

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

@@ -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)) {