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

Commit 0a9e04f3 authored by joshmccloskey's avatar joshmccloskey Committed by android-build-merger
Browse files

Merge "Fixed talkback issue with biometric prompt." into qt-r1-dev am: e2c17cc3 

am: 1e3d73fa

Change-Id: I5806b119f2654289251f8ee23f1cdec83a9914a1
parents 8b7167fc 1e3d73fa

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

+4 −2
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ public abstract class BiometricDialogView extends LinearLayout { 


        if (mRestoredState == null) {

            updateState(STATE_AUTHENTICATING);

            mNegativeButton.setText(mBundle.getCharSequence(BiometricPrompt.KEY_NEGATIVE_TEXT));

            final int hint = getHintStringResourceId();

            if (hint != 0) {

                mErrorText.setText(hint);
@@ -319,8 +320,6 @@ public abstract class BiometricDialogView extends LinearLayout { 
            mDescriptionText.setText(descriptionText);

        }



        mNegativeButton.setText(mBundle.getCharSequence(BiometricPrompt.KEY_NEGATIVE_TEXT));



        if (requiresConfirmation() && mRestoredState == null) {

            mPositiveButton.setVisibility(View.VISIBLE);

            mPositiveButton.setEnabled(false);
@@ -474,6 +473,8 @@ public abstract class BiometricDialogView extends LinearLayout { 
            mHandler.removeMessages(MSG_RESET_MESSAGE);

            mErrorText.setTextColor(mTextColor);

            mErrorText.setText(R.string.biometric_dialog_tap_confirm);

            mErrorText.setContentDescription(

                    getResources().getString(R.string.biometric_dialog_tap_confirm));

            mErrorText.setVisibility(View.VISIBLE);

            announceAccessibilityEvent();

            mPositiveButton.setVisibility(View.VISIBLE);
@@ -487,6 +488,7 @@ public abstract class BiometricDialogView extends LinearLayout { 


        if (newState == STATE_PENDING_CONFIRMATION || newState == STATE_AUTHENTICATED) {

            mNegativeButton.setText(R.string.cancel);

            mNegativeButton.setContentDescription(getResources().getString(R.string.cancel));

        }



        updateIcon(mState, newState);