From 50aea6e66b968151356bf12c448a1617b910798d Mon Sep 17 00:00:00 2001 From: joshmccloskey Date: Fri, 6 Sep 2019 11:32:25 -0700 Subject: [PATCH] Fixed talkback issue on confirm lock password. Fixes: 132156012 Test: Verified with BiometricPromptDemo that talkback now announces the correct password type for PIN/Pattern/Pass. Change-Id: I3a04fe691140abba40396f95a601f863d87ee394 --- .../settings/password/ConfirmLockPassword.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java index 2992ebeb8f4..12b272426ed 100644 --- a/src/com/android/settings/password/ConfirmLockPassword.java +++ b/src/com/android/settings/password/ConfirmLockPassword.java @@ -163,8 +163,16 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { mDetailsTextView.setText(detailsMessage); } int currentType = mPasswordEntry.getInputType(); - mPasswordEntry.setInputType(mIsAlpha ? currentType - : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD)); + if (mIsAlpha) { + mPasswordEntry.setInputType(currentType); + mPasswordEntry.setContentDescription( + getContext().getString(R.string.unlock_set_unlock_password_title)); + } else { + mPasswordEntry.setInputType( + InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD); + mPasswordEntry.setContentDescription( + getContext().getString(R.string.unlock_set_unlock_pin_title)); + } // Can't set via XML since setInputType resets the fontFamily to null mPasswordEntry.setTypeface(Typeface.create( getContext().getString(com.android.internal.R.string.config_headlineFontFamily),