Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07bb3ff9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix fingerprint dialog color contrast for dark theme"

parents 9dd8bfc9 8a239179

packages/SystemUI/res/values-night/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -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 -->

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 && 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);

    }

}

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

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

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

+4 −4
Original line number Diff line number Diff line
@@ -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;