Merge "Init confirm button in disabled state instead of gone state" into qt-dev am: 110144ca1e (910a797a) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -249,7 +249,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba
		mContext.getResources()
		.getText(mCurrentDialog.getAuthenticatedAccessibilityResourceId()));
		if (mCurrentDialog.requiresConfirmation()) {
		mCurrentDialog.showConfirmationButton(true /* show */);
		mCurrentDialog.onReadyForConfirmation();
		} else {
		mCurrentDialog.updateState(BiometricDialogView.STATE_AUTHENTICATED);
		mHandler.postDelayed(() -> {

+9 −8

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

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

		if (requiresConfirmation()) {
		mPositiveButton.setVisibility(View.VISIBLE);
		mPositiveButton.setEnabled(false);
		}

		if (mWasForceRemoved \|\| mSkipIntro) {
		// Show the dialog immediately
		mLayout.animate().cancel();
		@@ -406,14 +411,10 @@ public abstract class BiometricDialogView extends LinearLayout {
		return mRequireConfirmation;
		}

		public void showConfirmationButton(boolean show) {
		if (show) {
		public void onReadyForConfirmation() {
		mHandler.removeMessages(MSG_CLEAR_MESSAGE);
		updateState(STATE_PENDING_CONFIRMATION);
		mPositiveButton.setVisibility(View.VISIBLE);
		} else {
		mPositiveButton.setVisibility(View.GONE);
		}
		mPositiveButton.setEnabled(true);
		}

		public void setUserId(int userId) {

+6 −0

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

		if (show) {
		mPositiveButton.setVisibility(View.GONE);
		} else if (!show && requiresConfirmation()) {
		mPositiveButton.setVisibility(View.VISIBLE);
		}
		}

		@Override