Merge "Do not announce a11y move instructions in sensor area." into udc-dev

2023-03-01 22:53:23 +00:00
parent bb5f8cef7d 4a2d7d29d7
commit b48c247ef9
1 changed files with 5 additions and 0 deletions
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -1295,6 +1295,11 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
                    mUdfpsUtils.getTouchInNativeCoordinates(event.getPointerId(0),
                            event, udfpsEnrollView.getOverlayParams());

+            if (mUdfpsUtils.isWithinSensorArea(event.getPointerId(0), event,
+                    udfpsEnrollView.getOverlayParams())) {
+                return false;
+            }
+
            final String theStr = mUdfpsUtils.onTouchOutsideOfSensorArea(
                    mAccessibilityManager.isTouchExplorationEnabled(), context,
                    scaledTouch.x, scaledTouch.y, udfpsEnrollView.getOverlayParams());