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"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-19 22:33:09 +00:00
committed by Android (Google) Code Review
parent 9dd8bfc9bc 8a239179ad
commit 07bb3ff98b
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values-night/colors.xml
View File

@@ -73,7 +73,7 @@
<color name="media_divider">#85ffffff</color>
<!-- Biometric dialog colors -->
<color name="biometric_dialog_gray">#ff888888</color>
<color name="biometric_dialog_gray">#ffcccccc</color>
<color name="biometric_dialog_accent">#ff80cbc4</color> <!-- light teal -->
<color name="biometric_dialog_error">#fff28b82</color> <!-- red 300 -->

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

@@ -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 && getSize() == 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);
}
}

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

@@ -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) {

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

@@ -83,7 +83,7 @@ public abstract class AuthBiometricView extends LinearLayout {
* Authenticated, dialog animating away soon.
*/
protected static final int STATE_AUTHENTICATED = 6;
@Retention(RetentionPolicy.SOURCE)
@IntDef({STATE_IDLE, STATE_AUTHENTICATING_ANIMATING_IN, STATE_AUTHENTICATING, STATE_HELP,
STATE_ERROR, STATE_PENDING_CONFIRMATION, STATE_AUTHENTICATED})
@@ -168,8 +168,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 PromptInfo mPromptInfo;
@@ -183,7 +183,7 @@ public abstract class AuthBiometricView extends LinearLayout {
private TextView mDescriptionView;
private View mIconHolderView;
protected ImageView mIconView;
@VisibleForTesting protected TextView mIndicatorView;
protected TextView mIndicatorView;
// Negative button position, exclusively for the app-specified behavior
@VisibleForTesting Button mNegativeButton;