Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e31208ae authored by Sungmin Choi's avatar Sungmin Choi Committed by Android Git Automerger
Browse files

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

* commit '05c7dde1':
  To hide none security option, use config_hide_none_security_option config
parents 8ee8b379 05c7dde1

res/values-mcc505/bools.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?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>

res/values/bools.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/ChooseLockGeneric.java

+4 −0
Original line number Diff line number Diff line
@@ -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)) {