From fc397f7406a49226cf284f001cbed9eb470eca99 Mon Sep 17 00:00:00 2001 From: joshmccloskey Date: Tue, 27 Aug 2019 12:01:30 -0700 Subject: [PATCH] Set the content description of pin/password boxes Fixes: 79711253 Test: Talkback announces the correct string correctly upon using either flow. Change-Id: I01c4e308b8ef9d501f1f5d37e716956a12bea6dc --- src/com/android/settings/password/ChooseLockPassword.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 639dd6b63be..820aecb877a 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -467,6 +467,13 @@ public class ChooseLockPassword extends SettingsActivity { int currentType = mPasswordEntry.getInputType(); mPasswordEntry.setInputType(mIsAlphaMode ? currentType : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD)); + if (mIsAlphaMode) { + mPasswordEntry.setContentDescription( + getString(R.string.unlock_set_unlock_password_title)); + } else { + mPasswordEntry.setContentDescription( + 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),