Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix fingerprint dialog color contrast for dark theme" into rvc-qpr-dev am: e8ee10d299

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I032d9e0661952ef8938cb7d2de6dccc520d62ee2
This commit is contained in:
Curtis Belmonte
2021-01-20 19:46:51 +00:00
committed by Automerger Merge Worker
parent b7640bf2ed e8ee10d299
commit 5c02313dbb
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFaceView.java
View File

@@ -160,12 +160,12 @@ public class AuthBiometricFaceView extends AuthBiometricView {
@Override @Override
protected void handleResetAfterError() { protected void handleResetAfterError() {
resetErrorView(mContext, mIndicatorView); resetErrorView();
} }
@Override @Override
protected void handleResetAfterHelp() { protected void handleResetAfterHelp() {
resetErrorView(mContext, mIndicatorView); resetErrorView();
} }
@Override @Override
@@ -185,7 +185,7 @@ public class AuthBiometricFaceView extends AuthBiometricView {
if (newState == STATE_AUTHENTICATING_ANIMATING_IN || if (newState == STATE_AUTHENTICATING_ANIMATING_IN ||
(newState == STATE_AUTHENTICATING && mSize == AuthDialog.SIZE_MEDIUM)) { (newState == STATE_AUTHENTICATING && mSize == AuthDialog.SIZE_MEDIUM)) {
resetErrorView(mContext, mIndicatorView); resetErrorView();
} }
// Do this last since the state variable gets updated. // Do this last since the state variable gets updated.
@@ -204,9 +204,8 @@ public class AuthBiometricFaceView extends AuthBiometricView {
super.onAuthenticationFailed(failureReason); super.onAuthenticationFailed(failureReason);
} }
static void resetErrorView(Context context, TextView textView) { private void resetErrorView() {
textView.setTextColor(context.getResources().getColor( mIndicatorView.setTextColor(mTextColorHint);
R.color.biometric_dialog_gray, context.getTheme())); mIndicatorView.setVisibility(View.INVISIBLE);
textView.setVisibility(View.INVISIBLE);
} }
} }

2
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.java
View File

@@ -78,7 +78,7 @@ public class AuthBiometricFingerprintView extends AuthBiometricView {
private void showTouchSensorString() { private void showTouchSensorString() {
mIndicatorView.setText(R.string.fingerprint_dialog_touch_sensor); 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) { private void updateIcon(int lastState, int newState) {

8
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
View File

@@ -82,7 +82,7 @@ public abstract class AuthBiometricView extends LinearLayout {
* Authenticated, dialog animating away soon. * Authenticated, dialog animating away soon.
*/ */
protected static final int STATE_AUTHENTICATED = 6; protected static final int STATE_AUTHENTICATED = 6;
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({STATE_IDLE, STATE_AUTHENTICATING_ANIMATING_IN, STATE_AUTHENTICATING, STATE_HELP, @IntDef({STATE_IDLE, STATE_AUTHENTICATING_ANIMATING_IN, STATE_AUTHENTICATING, STATE_HELP,
STATE_ERROR, STATE_PENDING_CONFIRMATION, STATE_AUTHENTICATED}) STATE_ERROR, STATE_PENDING_CONFIRMATION, STATE_AUTHENTICATED})
@@ -155,8 +155,8 @@ public abstract class AuthBiometricView extends LinearLayout {
private final Injector mInjector; private final Injector mInjector;
private final Handler mHandler; private final Handler mHandler;
private final AccessibilityManager mAccessibilityManager; private final AccessibilityManager mAccessibilityManager;
private final int mTextColorError; protected final int mTextColorError;
private final int mTextColorHint; protected final int mTextColorHint;
private AuthPanelController mPanelController; private AuthPanelController mPanelController;
private Bundle mBiometricPromptBundle; private Bundle mBiometricPromptBundle;
@@ -169,7 +169,7 @@ public abstract class AuthBiometricView extends LinearLayout {
private TextView mSubtitleView; private TextView mSubtitleView;
private TextView mDescriptionView; private TextView mDescriptionView;
protected ImageView mIconView; protected ImageView mIconView;
@VisibleForTesting protected TextView mIndicatorView; protected TextView mIndicatorView;
@VisibleForTesting Button mNegativeButton; @VisibleForTesting Button mNegativeButton;
@VisibleForTesting Button mPositiveButton; @VisibleForTesting Button mPositiveButton;
@VisibleForTesting Button mTryAgainButton; @VisibleForTesting Button mTryAgainButton;