Revert "Replace UDFPS lockscreen a11y announcements with live region"

This reverts commit 868f3d76bf1e94bc904432ecd49aa384d96336d5.

Reason for revert: reverting to original accessibility state with announcements
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:28c239fd5be8202fc9aa286abef43629a6d3917f)
Merged-In: I5b7cf536cf0277a88e89f71f95bdd6d454c69a57
Change-Id: I5b7cf536cf0277a88e89f71f95bdd6d454c69a57

2 files changed, 5 insertions, 9 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/ui/view/UdfpsAccessibilityOverlay.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/ui/view/UdfpsAccessibilityOverlay.kt
index 9c3b9b273ab5..7be323073692 100644
--- a/packages/SystemUI/src/com/android/systemui/deviceentry/ui/view/UdfpsAccessibilityOverlay.kt
+++ b/packages/SystemUI/src/com/android/systemui/deviceentry/ui/view/UdfpsAccessibilityOverlay.kt
@@ -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)
diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/ui/viewmodel/UdfpsAccessibilityOverlayViewModel.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/ui/viewmodel/UdfpsAccessibilityOverlayViewModel.kt
index 1849bf20abdb..fa849bf5e413 100644
--- a/packages/SystemUI/src/com/android/systemui/deviceentry/ui/viewmodel/UdfpsAccessibilityOverlayViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/deviceentry/ui/viewmodel/UdfpsAccessibilityOverlayViewModel.kt
@@ -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