From 4d627f09c05bc18781d9b21833e61a1b608989f7 Mon Sep 17 00:00:00 2001 From: vadimt Date: Mon, 18 Nov 2019 19:26:30 -0800 Subject: [PATCH] Staring swipe-to-all-apps gesture from above bottom gesture area Bug: 139682945 Change-Id: I2fe8929c1dea8448c23394afd6f9d711b73f2562 --- tests/tapl/com/android/launcher3/tapl/Workspace.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index a0d1a5ee34..3301dd87d8 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -32,6 +32,7 @@ import androidx.test.uiautomator.By; import androidx.test.uiautomator.Direction; import androidx.test.uiautomator.UiObject2; +import com.android.launcher3.ResourceUtils; import com.android.launcher3.testing.TestProtocol; /** @@ -59,7 +60,11 @@ public final class Workspace extends Home { verifyActiveContainer(); final UiObject2 hotseat = mHotseat; final Point start = hotseat.getVisibleCenter(); - start.y = hotseat.getVisibleBounds().bottom - 1; + int deviceHeight = mLauncher.getDevice().getDisplayHeight(); + int bottomGestureMargin = ResourceUtils.getNavbarSize( + ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mLauncher.getResources()); + int displayBottom = deviceHeight - bottomGestureMargin; + start.y = displayBottom - 1; final int swipeHeight = mLauncher.getTestInfo( TestProtocol.REQUEST_HOME_TO_ALL_APPS_SWIPE_HEIGHT). getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);