From 050e5a64b76eeac04e9b6bd528b34c8974c0fe2a Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Thu, 10 Oct 2019 11:48:16 -0700 Subject: [PATCH] Set the negative button when configuration changes and dialog is restored Fixes: 140607595 Test: manual, rotate the device Change-Id: I9c9c0b9640735404d66c901011c39f28caa540da --- .../com/android/systemui/biometrics/BiometricDialogView.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java index ce67577ea4837..cbbd3a0b05625 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java @@ -499,6 +499,8 @@ 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)); + } else { + mNegativeButton.setText(mBundle.getCharSequence(BiometricPrompt.KEY_NEGATIVE_TEXT)); } updateIcon(mState, newState);