Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da749c76 authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Mark title & subtitle focusable, set selected unless a11y active" into... 

Merge "Mark title & subtitle focusable, set selected unless a11y active" into udc-d1-dev am: fad60a95

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24276367



Change-Id: I9cef3e70a8fc69ef5a397b691bd5414c9017c589
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9f22a1e fad60a95

packages/SystemUI/res/layout/biometric_prompt_layout.xml

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
        android:singleLine="true"

        android:marqueeRepeatLimit="1"

        android:ellipsize="marquee"

        android:importantForAccessibility="no"

        style="@style/TextAppearance.AuthCredential.Title"/>



    <TextView
@@ -39,7 +38,6 @@ 
        android:singleLine="true"

        android:marqueeRepeatLimit="1"

        android:ellipsize="marquee"

        android:importantForAccessibility="no"

        style="@style/TextAppearance.AuthCredential.Subtitle"/>



    <TextView

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt

+5 −3
Original line number Diff line number Diff line
@@ -93,9 +93,11 @@ object BiometricViewBinder { 
        val subtitleView = view.findViewById<TextView>(R.id.subtitle)

        val descriptionView = view.findViewById<TextView>(R.id.description)



        // set selected for marquee

        titleView.isSelected = true

        subtitleView.isSelected = true

        // set selected to enable marquee unless a screen reader is enabled

        titleView.isSelected =

            !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled

        subtitleView.isSelected =

            !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled

        descriptionView.movementMethod = ScrollingMovementMethod()



        val iconViewOverlay = view.findViewById<LottieAnimationView>(R.id.biometric_icon_overlay)