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

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

+36 −1

Original line number	Diff line number	Diff line
		@@ -17,10 +17,17 @@
		package com.android.keyguard;

		import android.content.Context;
		import android.provider.Settings;
		import android.util.AttributeSet;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.animation.AnimationUtils;
		import android.widget.LinearLayout;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.List;

		/**
		* Displays a PIN pad for unlocking.
		@@ -36,6 +43,8 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
		private View mDivider;
		private int mDisappearYTranslation;

		private static List<Integer> sNumbers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 0);

		public KeyguardPINView(Context context) {
		this(context, null);
		}
		@@ -64,13 +73,39 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();

		mKeyguardBouncerFrame = (ViewGroup) findViewById(R.id.keyguard_bouncer_frame);
		mRow0 = (ViewGroup) findViewById(R.id.row0);
		mRow1 = (ViewGroup) findViewById(R.id.row1);
		mRow2 = (ViewGroup) findViewById(R.id.row2);
		mRow3 = (ViewGroup) findViewById(R.id.row3);
		mDivider = findViewById(R.id.divider);

		boolean scramblePin = (Settings.System.getInt(getContext().getContentResolver(),
		Settings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1);

		if (scramblePin) {
		Collections.shuffle(sNumbers);
		// get all children who are NumPadKey's
		LinearLayout bouncer = (LinearLayout) findViewById(R.id.keyguard_bouncer_frame);
		List<NumPadKey> views = new ArrayList<NumPadKey>();
		for (int i = 0; i < bouncer.getChildCount(); i++) {
		if (bouncer.getChildAt(i) instanceof LinearLayout) {
		LinearLayout nestedLayout = ((LinearLayout) bouncer.getChildAt(i));
		for (int j = 0; j < nestedLayout.getChildCount(); j++){
		View view = nestedLayout.getChildAt(j);
		if (view.getClass() == NumPadKey.class) {
		views.add((NumPadKey) view);
		}
		}
		}
		}

		// reset the digits in the views
		for (int i = 0; i < sNumbers.size(); i++) {
		NumPadKey view = views.get(i);
		view.setDigit(sNumbers.get(i));
		}
		}
		}

		@Override

packages/Keyguard/src/com/android/keyguard/NumPadKey.java

+20 −12

Original line number	Diff line number	Diff line
		@@ -77,7 +77,6 @@ public class NumPadKey extends ViewGroup {
		public NumPadKey(Context context, AttributeSet attrs, int defStyle) {
		super(context, attrs, defStyle);
		setFocusable(true);

		TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.NumPadKey);

		try {
		@@ -92,7 +91,6 @@ public class NumPadKey extends ViewGroup {
		setAccessibilityDelegate(new ObscureSpeechDelegate(context));

		mEnableHaptics = new LockPatternUtils(context).isTactileFeedbackEnabled();

		mPM = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
		LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(
		Context.LAYOUT_INFLATER_SERVICE);
		@@ -102,7 +100,27 @@ public class NumPadKey extends ViewGroup {
		mDigitText.setText(Integer.toString(mDigit));
		mKlondikeText = (TextView) findViewById(R.id.klondike_text);

		updateText();
		setBackground(mContext.getDrawable(R.drawable.ripple_drawable));
		setContentDescription(mDigitText.getText().toString() + mKlondikeText.getText().toString());
		}

		@Override
		public void onDetachedFromWindow() {
		super.onDetachedFromWindow();

		// Reset the "announced headset" flag when detached.
		ObscureSpeechDelegate.sAnnouncedHeadset = false;
		}

		public void setDigit(int digit) {
		mDigit = digit;
		updateText();
		}

		private void updateText() {
		if (mDigit >= 0) {
		mDigitText.setText(Integer.toString(mDigit));
		if (sKlondike == null) {
		sKlondike = getResources().getStringArray(R.array.lockscreen_num_pad_klondike);
		}
		@@ -116,18 +134,8 @@ public class NumPadKey extends ViewGroup {
		}
		}
		}

		setBackground(mContext.getDrawable(R.drawable.ripple_drawable));
		setContentDescription(mDigitText.getText().toString() + mKlondikeText.getText().toString());
		}

		@Override
		public void onDetachedFromWindow() {
		super.onDetachedFromWindow();

		// Reset the "announced headset" flag when detached.
		ObscureSpeechDelegate.sAnnouncedHeadset = false;
		}

		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {