Revert^2 "9/N Clean Up Keyguard Class Structure" (9a80cc2e) · Commits · e / os / android_frameworks_base

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

+0 −45

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

		import android.content.Context;
		import android.content.res.ColorStateList;
		import android.util.AttributeSet;
		import android.view.HapticFeedbackConstants;
		import android.view.KeyEvent;
		import android.view.View;

		import com.android.internal.widget.LockPatternUtils;
		import com.android.internal.widget.LockscreenCredential;
		import com.android.systemui.R;

		@@ -31,8 +29,6 @@ import com.android.systemui.R;
		* Base class for PIN and password unlock screens.
		*/
		public abstract class KeyguardAbsKeyInputView extends KeyguardInputView {
		protected KeyguardSecurityCallback mCallback;
		protected SecurityMessageDisplay mSecurityMessageDisplay;
		protected View mEcaView;
		protected boolean mEnableHaptics;

		@@ -53,19 +49,6 @@ public abstract class KeyguardAbsKeyInputView extends KeyguardInputView {
		mEnableHaptics = enableHaptics;
		}

		@Override
		public void setKeyguardCallback(KeyguardSecurityCallback callback) {
		mCallback = callback;
		}

		@Override
		public void setLockPatternUtils(LockPatternUtils utils) {
		}

		@Override
		public void reset() {
		}

		protected abstract int getPasswordTextViewId();
		protected abstract void resetState();

		@@ -93,29 +76,6 @@ public abstract class KeyguardAbsKeyInputView extends KeyguardInputView {
		return mKeyDownListener != null && mKeyDownListener.onKeyDown(keyCode, event);
		}

		@Override
		public boolean needsInput() {
		return false;
		}

		@Override
		public KeyguardSecurityCallback getCallback() {
		return mCallback;
		}

		@Override
		public void showPromptReason(int reason) {

		}

		@Override
		public void showMessage(CharSequence message, ColorStateList colorState) {
		if (colorState != null) {
		mSecurityMessageDisplay.setNextMessageColor(colorState);
		}
		mSecurityMessageDisplay.setMessage(message);
		}

		protected abstract int getPromptReasonStringRes(int reason);

		// Cause a VIRTUAL_KEY vibration
		@@ -127,11 +87,6 @@ public abstract class KeyguardAbsKeyInputView extends KeyguardInputView {
		}
		}

		@Override
		public boolean startDisappearAnimation(Runnable finishRunnable) {
		return false;
		}

		public void setKeyDownListener(KeyDownListener keyDownListener) {
		mKeyDownListener = keyDownListener;
		}

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

+20 −8

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static com.android.internal.util.LatencyTracker.ACTION_CHECK_CREDENTIAL;
		import static com.android.internal.util.LatencyTracker.ACTION_CHECK_CREDENTIAL_UNLOCKED;
		import static com.android.keyguard.KeyguardAbsKeyInputView.MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT;

		import android.content.res.ColorStateList;
		import android.os.AsyncTask;
		import android.os.CountDownTimer;
		import android.os.SystemClock;
		@@ -38,7 +39,6 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
		extends KeyguardInputViewController<T> {
		private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
		private final LockPatternUtils mLockPatternUtils;
		protected final KeyguardSecurityCallback mKeyguardSecurityCallback;
		private final LatencyTracker mLatencyTracker;
		private CountDownTimer mCountdownTimer;
		protected KeyguardMessageAreaController mMessageAreaController;
		@@ -59,7 +59,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
		private final EmergencyButtonCallback mEmergencyButtonCallback = new EmergencyButtonCallback() {
		@Override
		public void onEmergencyButtonClickedWhenInCall() {
		mKeyguardSecurityCallback.reset();
		getKeyguardSecurityCallback().reset();
		}
		};

		@@ -73,7 +73,6 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
		super(view, securityMode, keyguardSecurityCallback);
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		mLockPatternUtils = lockPatternUtils;
		mKeyguardSecurityCallback = keyguardSecurityCallback;
		mLatencyTracker = latencyTracker;
		KeyguardMessageArea kma = KeyguardMessageArea.findSecurityMessageDisplay(mView);
		mMessageAreaController = messageAreaControllerFactory.create(kma);
		@@ -112,6 +111,19 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
		}
		}

		@Override
		public boolean needsInput() {
		return false;
		}

		@Override
		public void showMessage(CharSequence message, ColorStateList colorState) {
		if (colorState != null) {
		mMessageAreaController.setNextMessageColor(colorState);
		}
		mMessageAreaController.setMessage(message);
		}

		// Allow subclasses to override this behavior
		protected boolean shouldLockout(long deadline) {
		return deadline != 0;
		@@ -144,14 +156,14 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
		void onPasswordChecked(int userId, boolean matched, int timeoutMs, boolean isValidPassword) {
		boolean dismissKeyguard = KeyguardUpdateMonitor.getCurrentUser() == userId;
		if (matched) {
		mKeyguardSecurityCallback.reportUnlockAttempt(userId, true, 0);
		getKeyguardSecurityCallback().reportUnlockAttempt(userId, true, 0);
		if (dismissKeyguard) {
		mDismissing = true;
		mKeyguardSecurityCallback.dismiss(true, userId);
		getKeyguardSecurityCallback().dismiss(true, userId);
		}
		} else {
		if (isValidPassword) {
		mKeyguardSecurityCallback.reportUnlockAttempt(userId, false, timeoutMs);
		getKeyguardSecurityCallback().reportUnlockAttempt(userId, false, timeoutMs);
		if (timeoutMs > 0) {
		long deadline = mLockPatternUtils.setLockoutAttemptDeadline(
		userId, timeoutMs);
		@@ -236,8 +248,8 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
		}

		protected void onUserInput() {
		mKeyguardSecurityCallback.userActivity();
		mKeyguardSecurityCallback.onUserInput();
		getKeyguardSecurityCallback().userActivity();
		getKeyguardSecurityCallback().onUserInput();
		mMessageAreaController.setMessage("");
		}

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

+14 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.keyguard;

		import android.content.Context;
		import android.util.AttributeSet;
		import android.view.MotionEvent;
		import android.widget.LinearLayout;

		import androidx.annotation.Nullable;
		@@ -25,7 +26,7 @@ import androidx.annotation.Nullable;
		/**
		* A Base class for all Keyguard password/pattern/pin related inputs.
		*/
		public abstract class KeyguardInputView extends LinearLayout implements KeyguardSecurityView {
		public abstract class KeyguardInputView extends LinearLayout {

		public KeyguardInputView(Context context) {
		super(context);
		@@ -39,4 +40,16 @@ public abstract class KeyguardInputView extends LinearLayout implements Keyguard
		public KeyguardInputView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		}

		abstract CharSequence getTitle();

		boolean disallowInterceptTouch(MotionEvent event) {
		return false;
		}

		void startAppearAnimation() {}

		boolean startDisappearAnimation(Runnable finishRunnable) {
		return false;
		}
		}

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

+34 −48

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.keyguard;
		import android.content.res.ColorStateList;
		import android.content.res.Resources;
		import android.telephony.TelephonyManager;
		import android.view.MotionEvent;
		import android.view.inputmethod.InputMethodManager;

		import com.android.internal.util.LatencyTracker;
		@@ -37,18 +36,38 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		extends ViewController<T> implements KeyguardSecurityView {

		private final SecurityMode mSecurityMode;
		private final KeyguardSecurityCallback mKeyguardSecurityCallback;
		private boolean mPaused;


		// The following is used to ignore callbacks from SecurityViews that are no longer current
		// (e.g. face unlock). This avoids unwanted asynchronous events from messing with the
		// state for the current security method.
		private KeyguardSecurityCallback mNullCallback = new KeyguardSecurityCallback() {
		@Override
		public void userActivity() { }
		@Override
		public void reportUnlockAttempt(int userId, boolean success, int timeoutMs) { }
		@Override
		public boolean isVerifyUnlockOnly() {
		return false;
		}
		@Override
		public void dismiss(boolean securityVerified, int targetUserId) { }
		@Override
		public void dismiss(boolean authenticated, int targetId,
		boolean bypassSecondaryLockScreen) { }
		@Override
		public void onUserInput() { }
		@Override
		public void reset() {}
		};

		protected KeyguardInputViewController(T view, SecurityMode securityMode,
		KeyguardSecurityCallback keyguardSecurityCallback) {
		super(view);
		mSecurityMode = securityMode;
		mView.setKeyguardCallback(keyguardSecurityCallback);
		}

		@Override
		public void init() {
		super.init();
		mView.reset();
		mKeyguardSecurityCallback = keyguardSecurityCallback;
		}

		@Override
		@@ -63,63 +82,40 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		return mSecurityMode;
		}


		@Override
		public void setKeyguardCallback(KeyguardSecurityCallback callback) {
		mView.setKeyguardCallback(callback);
		protected KeyguardSecurityCallback getKeyguardSecurityCallback() {
		if (mPaused) {
		return mNullCallback;
		}

		@Override
		public void setLockPatternUtils(LockPatternUtils utils) {
		mView.setLockPatternUtils(utils);
		return mKeyguardSecurityCallback;
		}

		@Override
		public void reset() {
		mView.reset();
		}

		@Override
		public void onPause() {
		mView.onPause();
		mPaused = true;
		}

		@Override
		public void onResume(int reason) {
		mView.onResume(reason);
		}

		@Override
		public boolean needsInput() {
		return mView.needsInput();
		}

		@Override
		public KeyguardSecurityCallback getCallback() {
		return mView.getCallback();
		mPaused = false;
		}

		@Override
		public void showPromptReason(int reason) {
		mView.showPromptReason(reason);
		}

		@Override
		public void showMessage(CharSequence message, ColorStateList colorState) {
		mView.showMessage(message, colorState);
		}

		@Override
		public void showUsabilityHint() {
		mView.showUsabilityHint();
		}

		@Override
		public void startAppearAnimation() {
		mView.startAppearAnimation();
		}

		@Override
		public boolean startDisappearAnimation(Runnable finishRunnable) {
		return mView.startDisappearAnimation(finishRunnable);
		}
		@@ -129,16 +125,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
		return mView.getTitle();
		}

		@Override
		public boolean disallowInterceptTouch(MotionEvent event) {
		return mView.disallowInterceptTouch(event);
		}

		@Override
		public void onStartingToHide() {
		mView.onStartingToHide();
		}

		/** Finds the index of this view in the suppplied parent view. */
		public int getIndexIn(KeyguardSecurityViewFlipper view) {
		return view.indexOfChild(mView);

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

+0 −27

Original line number	Diff line number	Diff line
		@@ -103,28 +103,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
		new View[]{
		null, mEcaView, null
		}};

		View cancelBtn = findViewById(R.id.cancel_button);
		if (cancelBtn != null) {
		cancelBtn.setOnClickListener(view -> {
		mCallback.reset();
		mCallback.onCancelClicked();
		});
		}
		}

		@Override
		public void onPause() {

		}

		@Override
		public void onResume(int reason) {

		}

		@Override
		public void showUsabilityHint() {
		}

		@Override
		@@ -148,11 +126,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
		});
		}

		@Override
		public boolean startDisappearAnimation(final Runnable finishRunnable) {
		return false;
		}

		public boolean startDisappearAnimation(boolean needsSlowUnlockTransition,
		final Runnable finishRunnable) {