Snap for 7092999 from 2dd4e12e5447c0a611fa0c076d4fbdb1d3237b93 to rvc-qpr3-release (171bf2a7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFaceView.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -160,12 +160,12 @@ public class AuthBiometricFaceView extends AuthBiometricView {

		@Override
		protected void handleResetAfterError() {
		resetErrorView(mContext, mIndicatorView);
		resetErrorView();
		}

		@Override
		protected void handleResetAfterHelp() {
		resetErrorView(mContext, mIndicatorView);
		resetErrorView();
		}

		@Override
		@@ -185,7 +185,7 @@ public class AuthBiometricFaceView extends AuthBiometricView {

		if (newState == STATE_AUTHENTICATING_ANIMATING_IN \|\|
		(newState == STATE_AUTHENTICATING && mSize == AuthDialog.SIZE_MEDIUM)) {
		resetErrorView(mContext, mIndicatorView);
		resetErrorView();
		}

		// Do this last since the state variable gets updated.
		@@ -204,9 +204,8 @@ public class AuthBiometricFaceView extends AuthBiometricView {
		super.onAuthenticationFailed(failureReason);
		}

		static void resetErrorView(Context context, TextView textView) {
		textView.setTextColor(context.getResources().getColor(
		R.color.biometric_dialog_gray, context.getTheme()));
		textView.setVisibility(View.INVISIBLE);
		private void resetErrorView() {
		mIndicatorView.setTextColor(mTextColorHint);
		mIndicatorView.setVisibility(View.INVISIBLE);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ public class AuthBiometricFingerprintView extends AuthBiometricView {

		private void showTouchSensorString() {
		mIndicatorView.setText(R.string.fingerprint_dialog_touch_sensor);
		mIndicatorView.setTextColor(R.color.biometric_dialog_gray);
		mIndicatorView.setTextColor(mTextColorHint);
		}

		private void updateIcon(int lastState, int newState) {

+4 −4

Original line number	Diff line number	Diff line
		@@ -155,8 +155,8 @@ public abstract class AuthBiometricView extends LinearLayout {
		private final Injector mInjector;
		private final Handler mHandler;
		private final AccessibilityManager mAccessibilityManager;
		private final int mTextColorError;
		private final int mTextColorHint;
		protected final int mTextColorError;
		protected final int mTextColorHint;

		private AuthPanelController mPanelController;
		private Bundle mBiometricPromptBundle;
		@@ -169,7 +169,7 @@ public abstract class AuthBiometricView extends LinearLayout {
		private TextView mSubtitleView;
		private TextView mDescriptionView;
		protected ImageView mIconView;
		@VisibleForTesting protected TextView mIndicatorView;
		protected TextView mIndicatorView;
		@VisibleForTesting Button mNegativeButton;
		@VisibleForTesting Button mPositiveButton;
		@VisibleForTesting Button mTryAgainButton;

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ public interface WakeLock {
		static final String REASON_WRAP = "wrap";

		/**
		* Default wake-lock timeout, to avoid battery regressions.
		* Default wake-lock timeout in milliseconds, to avoid battery regressions.
		*/
		long DEFAULT_MAX_TIMEOUT = 20000;

		@@ -104,6 +104,7 @@ public interface WakeLock {
		if (count == null) {
		Log.wtf(TAG, "Releasing WakeLock with invalid reason: " + why,
		new Throwable());
		return;
		} else if (count == 1) {
		mActiveClients.remove(why);
		} else {