From da9204a96ba276c99b62e4bb4504f06eebea6a12 Mon Sep 17 00:00:00 2001
From: Curtis Belmonte <curtislb@google.com>
Date: Fri, 3 Apr 2020 11:51:10 -0700
Subject: Improve a11y for BiometricPrompt credential view

Ensures text that is important for accessibility in the auth prompt
credential view is read aloud by TalkBack.

Test: Manual:
1. Set PIN/pattern/password as screen unlock method
3. Enable Talkback in settings
4. Launch the CtsVerifier-v2 test app
5. Open SECURITY > Biometric Tests > BIOMETRIC+CREDENTIAL TESTS
6. Tap 4a: SetUserAuthParams: Credential, Cipher
7. Tap Choose Unlock time-based key with credential
8. Enter an incorrect PIN/pattern/password

Fixes: 151389440
Fixes: 151390960
Change-Id: I95c38cb678b0ae46988539b167c48fe9572677bc
---
 packages/SystemUI/res/values/styles.xml                               | 1 +
 .../src/com/android/systemui/biometrics/AuthCredentialView.java       | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 1598465d6df0..aabee1c952e8 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -249,6 +249,7 @@
     <style name="TextAppearance.DeviceManagementDialog.Title" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>
 
     <style name="TextAppearance.AuthCredential">
+        <item name="android:accessibilityLiveRegion">polite</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:textAlignment">gravity</item>
         <item name="android:layout_gravity">top</item>
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java
index b006bc1351a3..8bf259182544 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java
@@ -214,9 +214,11 @@ public abstract class AuthCredentialView extends LinearLayout {
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
 
-        setText(mTitleView, getTitle(mBiometricPromptBundle));
+        final CharSequence title = getTitle(mBiometricPromptBundle);
+        setText(mTitleView, title);
         setTextOrHide(mSubtitleView, getSubtitle(mBiometricPromptBundle));
         setTextOrHide(mDescriptionView, getDescription(mBiometricPromptBundle));
+        announceForAccessibility(title);
 
         final boolean isManagedProfile = Utils.isManagedProfile(mContext, mEffectiveUserId);
         final Drawable image;
-- 
cgit v1.2.3-59-g8ed1b