Merge "Snap for 7277511 from 28528bf3b9c5d0cad9a6021df868617f7d1e8a32 to android11-tests-release" into android11-tests-releasesparse-7278305-L46300000884685813

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
index f64c6bf998d..ba8dffd888f 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
@@ -165,7 +165,11 @@ public class TouchExplorerTest {
                     mView.getLocationOnScreen(viewLocation);
                     mTapLocation = new PointF(viewLocation[0] + midX, viewLocation[1] + midY);
                     mSwipeDistance = mView.getWidth() / 4;
-                    mSwipeTimeMillis = (long) mSwipeDistance * 4;
+
+                    // This must be slower than 10mm per 150ms to be detected as touch exploration.
+                    final double swipeDistanceMm = mSwipeDistance / metrics.xdpi * 25.4;
+                    mSwipeTimeMillis = (long) swipeDistanceMm * 20;
+
                     mView.setOnClickListener(mClickListener);
                     mView.setOnLongClickListener(mLongClickListener);
                 });