隐藏Settings里除了 无 以外的其他屏幕锁定方式

diff --git a/apps/Settings/src/com/android/settings/password/ChooseLockGenericController.java b/apps/Settings/src/com/android/settings/password/ChooseLockGenericController.java
old mode 100644
new mode 100755
index 62a0063..cc27153
--- a/apps/Settings/src/com/android/settings/password/ChooseLockGenericController.java
+++ b/apps/Settings/src/com/android/settings/password/ChooseLockGenericController.java
@@ -23,6 +23,8 @@ import android.app.admin.DevicePolicyManager.PasswordComplexity;
import android.app.admin.PasswordMetrics;
import android.content.Context;
import android.os.UserHandle;
+import android.os.SystemProperties;
+


import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
@@ -102,22 +104,40 @@ public class ChooseLockGenericController {
      */
     public boolean isScreenLockVisible(ScreenLockType type) {
         final boolean managedProfile = mUserId != UserHandle.myUserId();
-        switch (type) {
-            case NONE:
-                return !mContext.getResources().getBoolean(R.bool.config_hide_none_security_option)
-                    && !managedProfile; // Profiles should use unified challenge instead.
-            case SWIPE:
-                return !mContext.getResources().getBoolean(R.bool.config_hide_swipe_security_option)
-                    && !managedProfile; // Swipe doesn't make sense for profiles.
-            case MANAGED:
-                return mManagedPasswordProvider.isManagedPasswordChoosable();
-            case PIN:
-            case PATTERN:
-            case PASSWORD:
-                // Hide the secure lock screen options if the device doesn't support the secure lock
-                // screen feature.
-                return mLockPatternUtils.hasSecureLockScreen();
-        }
+               // add by xyx
+                       switch (type) {
+                               case NONE:
+                                       return !mContext.getResources().getBoolean(R.bool.config_hide_none_security_option)
+                                               && !managedProfile; // Profiles should use unified challenge instead.
+                               case SWIPE:
+                               case MANAGED:
+                               case PIN:
+                               case PATTERN:
+                               case PASSWORD:
+                                       return false;
+                       }
+               // end xyx
+
+
         return true;
     }


(END)