diff options
| author | Sally Yuen <sallyyuen@google.com> | 2023-12-05 18:58:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-05 18:58:52 +0000 |
| commit | 86804d9d94d9cc553bceeeca51efb6a1f4f413ac (patch) | |
| tree | 5ff9711004e124d66d476d4bdee9e9ee6608efcf | |
| parent | 5b1e5d3268b10cf86788359228ec6773a18f3a8b (diff) | |
| parent | 82f6e5b3ffa4c6621b2f98fc65dd6392b2a248cc (diff) | |
| download | cts-86804d9d94d9cc553bceeeca51efb6a1f4f413ac.tar.gz | |
Merge "[Exo] Correct the area for gesture detection" into android14-tests-dev
| -rw-r--r-- | tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDisplayProxyTest.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDisplayProxyTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDisplayProxyTest.java index 60c00220bec..4306fdc3494 100644 --- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDisplayProxyTest.java +++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDisplayProxyTest.java @@ -105,7 +105,6 @@ import android.platform.test.annotations.Presubmit; import android.provider.Settings; import android.util.DisplayMetrics; import android.util.SparseArray; -import android.util.TypedValue; import android.view.Display; import android.view.InputDevice; import android.view.KeyEvent; @@ -204,8 +203,10 @@ public class AccessibilityDisplayProxyTest { private static final String SEPARATE_PROCESS_PACKAGE_NAME = "foo.bar.proxy"; private static final String SEPARATE_PROCESS_ACTIVITY = ".NonProxySeparateAppActivity"; - - private static final float MIN_SCREEN_WIDTH_MM = 40.0f; + public static final int VIRTUAL_DISPLAY_WIDTH = 100; + // Minimum screen width for supporting taps. This is more arbitrary since clicking or + // tapping requires a single point. We use half the virtual display width. + private static final int MIN_SCREEN_WIDTH_TAP_PX = VIRTUAL_DISPLAY_WIDTH / 2; private static final int TEST_SYSTEM_ACTION_ID = 1000; public static final String INSTRUMENTED_STREAM_ROLE_PACKAGE_NAME = "android.accessibilityservice.cts"; @@ -583,8 +584,7 @@ public class AccessibilityDisplayProxyTest { WindowManager.class); final DisplayMetrics metrics = new DisplayMetrics(); windowManager.getDefaultDisplay().getRealMetrics(metrics); - assumeTrue(areaOfActivityWindowOnDisplay.width() > TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_MM, MIN_SCREEN_WIDTH_MM, metrics)); + assumeTrue(areaOfActivityWindowOnDisplay.width() > MIN_SCREEN_WIDTH_TAP_PX); sUiAutomation.executeAndWaitForEvent(() -> { final int xOnScreen = areaOfActivityWindowOnDisplay.centerX(); @@ -1508,7 +1508,8 @@ public class AccessibilityDisplayProxyTest { mFakeAssociationRule.getAssociationInfo().getId(), DEFAULT_VIRTUAL_DEVICE_PARAMS); // Values taken from StreamedAppClipboardTest - mImageReader = ImageReader.newInstance(/* width= */ 100, /* height= */ 100, + mImageReader = ImageReader.newInstance(/* width= */ VIRTUAL_DISPLAY_WIDTH, + /* height= */ 100, PixelFormat.RGBA_8888, /* maxImages= */ 1); display = mVirtualDevice.createVirtualDisplay( /* width= */ mImageReader.getWidth(), |