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

Commit 28c239fd authored by Grace Cheng's avatar Grace Cheng
Browse files

Revert "Replace UDFPS lockscreen a11y announcements with live region" 

This reverts commit 868f3d76.

Reason for revert: reverting to original accessibility state with announcements

Change-Id: I5b7cf536cf0277a88e89f71f95bdd6d454c69a57
parent f7170344

packages/SystemUI/src/com/android/systemui/deviceentry/ui/view/UdfpsAccessibilityOverlay.kt

+1 −5
Original line number Diff line number Diff line
@@ -20,8 +20,4 @@ import android.content.Context 
import android.view.View



/** Overlay to handle under-fingerprint sensor accessibility events. */

class UdfpsAccessibilityOverlay(context: Context?) : View(context) {

    init {

        accessibilityLiveRegion = ACCESSIBILITY_LIVE_REGION_ASSERTIVE

    }

}
 
class UdfpsAccessibilityOverlay(context: Context?) : View(context)

packages/SystemUI/src/com/android/systemui/deviceentry/ui/viewmodel/UdfpsAccessibilityOverlayViewModel.kt

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ abstract class UdfpsAccessibilityOverlayViewModel( 
                event.getPointerId(0),

                event,

                overlayParams, /* rotateToPortrait */

                false,

                false

            )



        if (
@@ -64,7 +64,7 @@ abstract class UdfpsAccessibilityOverlayViewModel( 
                event.getPointerId(0),

                event,

                overlayParams,

                /* rotateTouchToPortrait */ false,

                /* rotateTouchToPortrait */ false

            )

        ) {

            // view only receives motionEvents when [visible] which requires touchExplorationEnabled
@@ -75,10 +75,10 @@ abstract class UdfpsAccessibilityOverlayViewModel( 
                    scaledTouch.x,

                    scaledTouch.y,

                    overlayParams,

                    /* touchRotatedToPortrait */ false,

                    /* touchRotatedToPortrait */ false

                )

            if (announceStr != null) {

                v.contentDescription = announceStr

                v.announceForAccessibility(announceStr)

            }

        }

        // always let the motion events go through to underlying views