fixup! Keyguard: Add option to scramble pin layout when unlocking (2/2). (71dff9ba) · Commits · e / os / android_frameworks_base

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -44,8 +44,6 @@ import com.android.settingslib.animation.DisappearAnimationUtils;
		import com.android.systemui.res.R;
		import com.android.systemui.statusbar.policy.DevicePostureController.DevicePostureInt;

		import lineageos.providers.LineageSettings;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		@@ -278,12 +276,9 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
		new View[]{
		null, mEcaView, null
		}};
		updatePinScrambling();
		}

		private void updatePinScrambling() {
		final boolean scramblePin = LineageSettings.System.getInt(getContext().getContentResolver(),
		LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1;
		protected void updatePinScrambling(boolean scramblePin) {
		if (scramblePin \|\| scramblePin != mScramblePin) {
		mScramblePin = scramblePin;
		if (scramblePin) {
		@@ -320,7 +315,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {

		@Override
		public void startAppearAnimation() {
		updatePinScrambling();
		setAlpha(1f);
		setTranslationY(0);
		if (mAppearAnimator.isRunning()) {

+10 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ import com.android.systemui.res.R;
		import com.android.systemui.statusbar.policy.DevicePostureController;
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor;

		import lineageos.providers.LineageSettings;

		public class KeyguardPinViewController
		extends KeyguardPinBasedInputViewController<KeyguardPINView> {
		private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
		@@ -97,6 +99,10 @@ public class KeyguardPinViewController
		mPasswordEntry.setUsePinShapes(true);
		updateAutoConfirmationState();
		}
		mView.updatePinScrambling(
		LineageSettings.System.getIntForUser(getContext().getContentResolver(),
		LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0,
		mSelectedUserInteractor.getSelectedUserId()) == 1);
		}

		protected void onUserInput() {
		@@ -120,6 +126,10 @@ public class KeyguardPinViewController
		@Override
		public void startAppearAnimation() {
		super.startAppearAnimation();
		mView.updatePinScrambling(
		LineageSettings.System.getIntForUser(getContext().getContentResolver(),
		LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0,
		mSelectedUserInteractor.getSelectedUserId()) == 1);
		}

		@Override

+1 −5

Original line number	Diff line number	Diff line
		@@ -41,8 +41,6 @@ import com.android.settingslib.Utils;
		import com.android.systemui.bouncer.ui.helper.BouncerHapticPlayer;
		import com.android.systemui.res.R;

		import lineageos.providers.LineageSettings;

		/**
		* Viewgroup for the bouncer numpad button, specifically for digits.
		*/
		@@ -140,8 +138,6 @@ public class NumPadKey extends ViewGroup implements NumPadAnimationListener {
		}

		private void updateText() {
		boolean scramblePin = (LineageSettings.System.getInt(getContext().getContentResolver(),
		LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1);
		if (mDigit >= 0) {
		mDigitText.setText(Integer.toString(mDigit));
		if (sKlondike == null) {
		@@ -150,7 +146,7 @@ public class NumPadKey extends ViewGroup implements NumPadAnimationListener {
		if (sKlondike != null && sKlondike.length > mDigit) {
		String klondike = sKlondike[mDigit];
		final int len = klondike.length();
		if (len > 0 \|\| scramblePin) {
		if (len > 0) {
		mKlondikeText.setText(klondike);
		} else if (mKlondikeText.getVisibility() != View.GONE) {
		mKlondikeText.setVisibility(View.INVISIBLE);