add SIM PIN/PUK input layout scrambling setting

Author: muhomorr

res/xml/sim_lock_settings.xml

@@ -23,6 +23,11 @@
             android:summaryOn="@string/sim_lock_on"
             android:summaryOff="@string/sim_lock_off"/>
 
+    <SwitchPreferenceCompat
+            android:key="sim_scramble_pin_layout"
+            android:dependency="sim_toggle"
+            android:title="@string/scramble_pin_title"/>
+
     <com.android.settings.EditPinPreference
             android:key="sim_pin"
             android:dependency="sim_toggle"

src/com/android/settings/IccLockSettings.java

@@ -23,6 +23,7 @@
 import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.ext.settings.ExtSettings;
 import android.graphics.PixelFormat;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -124,6 +125,7 @@ public class IccLockSettings extends SettingsPreferenceFragment
 
     private EditPinPreference mPinDialog;
     private TwoStatePreference mPinToggle;
+    private TwoStatePreference mPinScramblingToggle;
 
     private Resources mRes;
 
@@ -195,6 +197,10 @@ public void onCreate(Bundle savedInstanceState) {
 
         mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG);
         mPinToggle = (TwoStatePreference) findPreference(PIN_TOGGLE);
+        mPinScramblingToggle = (TwoStatePreference) findPreference("sim_scramble_pin_layout");
+        mPinScramblingToggle.setOnPreferenceChangeListener((preference, newValue) -> {
+            return ExtSettings.SCRAMBLE_SIM_PIN_LAYOUT.put(requireContext(), (boolean) newValue);
+        });
         if (savedInstanceState != null) {
             if (savedInstanceState.containsKey(DIALOG_STATE)
                     && restoreDialogStates(savedInstanceState)) {
@@ -358,6 +364,8 @@ private void updatePreferences() {
                 mPinToggle.setChecked(isIccLockEnabled());
             }
         }
+
+        mPinScramblingToggle.setChecked(ExtSettings.SCRAMBLE_SIM_PIN_LAYOUT.get(requireContext()));
     }
 
     @Override