summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Curtis Belmonte <curtislb@google.com> 2020-05-08 13:40:31 -0700
committer Curtis Belmonte <curtislb@google.com> 2020-05-08 13:49:33 -0700
commitbca44547d0ec6c31247a9a49d1606a84d785937e (patch)
treeff6d279439549be83f2c38d59121893262c6557a
parent75aeabdd8a5113987545a4d4ff3bcfc14b45a1b2 (diff)
Fix BiometricPrompt double TalkBack announcement
Fixes an issue that caused the content description for the BiometricPrompt background cancellation target to be read aloud twice by TalkBack when the prompt was displayed. Test: Manual: 1. Enable Talkback 2. Install the CtsVerifier apk 3. Launch app and select Biometric Tests > 4a: Cipher, Credential 4. Select "time-based key with biometric" to launch prompt Before: TalkBack reads "Tap to cancel authentication. Tap to cancel authentication, button." After: TalkBack reads "SystemUI. Tap to cancel authentication, button." Fixes: 155042588 Change-Id: I93f7380d87213aba8f1e1030510b84170ae9c2f7
-rw-r--r--packages/SystemUI/res/layout/auth_container_view.xml1
-rw-r--r--packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout/auth_container_view.xml b/packages/SystemUI/res/layout/auth_container_view.xml
index 63eccda5d309..3db01a4e7f3a 100644
--- a/packages/SystemUI/res/layout/auth_container_view.xml
+++ b/packages/SystemUI/res/layout/auth_container_view.xml
@@ -23,7 +23,6 @@
android:id="@+id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:accessibilityLiveRegion="polite"
android:background="@color/biometric_dialog_dim_color"
android:contentDescription="@string/biometric_dialog_empty_space_description"/>
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
index b736b4df8abf..b0051d00e0b5 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
@@ -300,6 +300,7 @@ public class AuthContainerView extends LinearLayout
return true;
});
+ setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
setFocusableInTouchMode(true);
requestFocus();
}