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

Commit 5c02313d authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I032d9e0661952ef8938cb7d2de6dccc520d62ee2
parents b7640bf2 e8ee10d2

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

    }

}

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
@@ -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;