commit c28bd6bbf8b6e67a12197d2b28a9aab9e5813746
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Apr 06 01:16:13 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 06 01:16:13 2024 +0000
tree bee7e9efb69fea902f7927e551779febce775551
parent 1865dfa0dfe7e2c82c89aa1292b0c09665b95fc5
parent 90e09e07a4363f1f762f5d1b683e64f1226c8dbe

Merge "Fix overlapping sensor icon and ignore logo a11y" into main

packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml

diff --git a/packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml b/packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml
index 4aa6092..8e3cf4d 100644
--- a/packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml
+++ b/packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml
@@ -70,6 +70,7 @@
                 android:layout_height="@dimen/biometric_prompt_logo_size"
                 android:layout_gravity="center"
                 android:scaleType="fitXY"
+                android:importantForAccessibility="no"
                 app:layout_constraintBottom_toTopOf="@+id/logo_description"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"

packages/SystemUI/res/values/styles.xml

diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 9da4f79..2c9006e 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -230,6 +230,8 @@
     <style name="TextAppearance.AuthCredential.Indicator" parent="TextAppearance.Material3.BodyMedium">
         <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
         <item name="android:marqueeRepeatLimit">marquee_forever</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">marquee</item>
     </style>
 
     <style name="TextAppearance.AuthCredential.Error">