fixup! add option to scramble PIN layout

Extracted from:
commit caa335d
Author: Fred Underwood <[email protected]>
Date:   Sun Dec 22 06:53:47 2024 +1000

    add second factor UI

Author: muhomorr

packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java

@@ -16,6 +16,7 @@
 
 package com.android.keyguard;
 
+import static com.android.keyguard.KeyguardSecurityModel.SecurityMode.BiometricSecondFactorPin;
 import static com.android.systemui.Flags.pinInputFieldStyledFocusState;
 import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;
 
@@ -95,9 +96,14 @@ protected KeyguardPinBasedInputViewController(T view,
 
         Context ctx = view.getContext().getApplicationContext();
         int userId = mSelectedUserInteractor.getSelectedUserId();
-        BoolSetting setting = this instanceof KeyguardPinViewController ?
-                ExtSettings.SCRAMBLE_LOCKSCREEN_PIN_LAYOUT :
-                ExtSettings.SCRAMBLE_SIM_PIN_LAYOUT;
+        BoolSetting setting;
+        if (this instanceof KeyguardPinViewController) {
+            setting = securityMode == BiometricSecondFactorPin ?
+                    ExtSettings.SCRAMBLE_LOCKSCREEN_PIN_LAYOUT_SECONDARY :
+                    ExtSettings.SCRAMBLE_LOCKSCREEN_PIN_LAYOUT_PRIMARY;
+        } else {
+            setting = ExtSettings.SCRAMBLE_SIM_PIN_LAYOUT;
+        }
         view.setupPinScrambling(setting.get(ctx, userId));
     }