summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wenhui Yang <wenhuiy@google.com> 2023-05-04 16:49:15 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-04 16:49:15 +0000
commit7bb31ace3b3f6608fa41c1e374b3bd9fbf0d8f42 (patch)
tree36206c081ce2f0c15d9e6b0b72f4e571ab3c40a1
parent7c33508eb0f4078e2eed237478855a7632cdc8be (diff)
parent97f49f9849e6d4f464cfd463f1ef22834aa140ae (diff)
Merge "Disable talkback for title and subtitle in BP" into udc-dev
-rw-r--r--packages/SystemUI/res/layout/auth_biometric_contents.xml2
-rw-r--r--packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/res/layout/auth_biometric_contents.xml b/packages/SystemUI/res/layout/auth_biometric_contents.xml
index be76405744db..b3b40f340ecb 100644
--- a/packages/SystemUI/res/layout/auth_biometric_contents.xml
+++ b/packages/SystemUI/res/layout/auth_biometric_contents.xml
@@ -24,6 +24,7 @@
android:singleLine="true"
android:marqueeRepeatLimit="1"
android:ellipsize="marquee"
+ android:importantForAccessibility="no"
style="@style/TextAppearance.AuthCredential.Title"/>
<TextView
@@ -34,6 +35,7 @@
android:singleLine="true"
android:marqueeRepeatLimit="1"
android:ellipsize="marquee"
+ android:importantForAccessibility="no"
style="@style/TextAppearance.AuthCredential.Subtitle"/>
<TextView
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
index f330c34bfaa0..e089fd32829d 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
@@ -741,10 +741,10 @@ public abstract class AuthBiometricView extends LinearLayout {
mTitleView.setText(mPromptInfo.getTitle());
- //setSelected could make marguee work
+ // setSelected could make marquee work
mTitleView.setSelected(true);
mSubtitleView.setSelected(true);
- //make description view become scrollable
+ // make description view become scrollable
mDescriptionView.setMovementMethod(new ScrollingMovementMethod());
if (isDeviceCredentialAllowed()) {