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

Commit a35a6d54 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Init confirm button in disabled state instead of gone state" into qt-dev 

am: 110144ca

Change-Id: Ic004dd281fb577778dbe8a3756eb754583ca670d
parents 25ddd06d 110144ca

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -249,7 +249,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba 
                    mContext.getResources()

                    mContext.getResources()

                            .getText(mCurrentDialog.getAuthenticatedAccessibilityResourceId()));

                            .getText(mCurrentDialog.getAuthenticatedAccessibilityResourceId()));

            if (mCurrentDialog.requiresConfirmation()) {

            if (mCurrentDialog.requiresConfirmation()) {

                mCurrentDialog.showConfirmationButton(true /* show */);

                mCurrentDialog.onReadyForConfirmation();

            } else {

            } else {

                mCurrentDialog.updateState(BiometricDialogView.STATE_AUTHENTICATED);

                mCurrentDialog.updateState(BiometricDialogView.STATE_AUTHENTICATED);

                mHandler.postDelayed(() -> {

                mHandler.postDelayed(() -> {

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

+9 −8
Original line number Original line Diff line number Diff line
@@ -288,6 +288,11 @@ public abstract class BiometricDialogView extends LinearLayout { 




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

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





        if (requiresConfirmation()) {

            mPositiveButton.setVisibility(View.VISIBLE);

            mPositiveButton.setEnabled(false);

        }



        if (mWasForceRemoved || mSkipIntro) {

        if (mWasForceRemoved || mSkipIntro) {

            // Show the dialog immediately

            // Show the dialog immediately

            mLayout.animate().cancel();

            mLayout.animate().cancel();
@@ -406,14 +411,10 @@ public abstract class BiometricDialogView extends LinearLayout { 
        return mRequireConfirmation;

        return mRequireConfirmation;

    }

    }





    public void showConfirmationButton(boolean show) {

    public void onReadyForConfirmation() {

        if (show) {

        mHandler.removeMessages(MSG_CLEAR_MESSAGE);

        mHandler.removeMessages(MSG_CLEAR_MESSAGE);

        updateState(STATE_PENDING_CONFIRMATION);

        updateState(STATE_PENDING_CONFIRMATION);

            mPositiveButton.setVisibility(View.VISIBLE);

        mPositiveButton.setEnabled(true);

        } else {

            mPositiveButton.setVisibility(View.GONE);

        }

    }

    }





    public void setUserId(int userId) {

    public void setUserId(int userId) {

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -293,6 +293,12 @@ public class FaceDialogView extends BiometricDialogView { 
                mTryAgainButton.setVisibility(View.GONE);

                mTryAgainButton.setVisibility(View.GONE);

            }

            }

        }

        }



        if (show) {

            mPositiveButton.setVisibility(View.GONE);

        } else if (!show && requiresConfirmation()) {

            mPositiveButton.setVisibility(View.VISIBLE);

        }

    }

    }





    @Override

    @Override