From a31f7eb68dacaa82c8707009ead5224e21db5e31 Mon Sep 17 00:00:00 2001 From: vadimt Date: Mon, 25 Feb 2019 15:47:43 -0800 Subject: [PATCH] Using different swipe length to switch to Overview. Depends on whether swiping from Workspace or Background. Change-Id: I0f647e85080ee1458a0f18cb132b87890379260e --- tests/tapl/com/android/launcher3/tapl/Background.java | 6 +++++- tests/tapl/com/android/launcher3/tapl/Workspace.java | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java index b3fb5e7fdb..606cf37a98 100644 --- a/tests/tapl/com/android/launcher3/tapl/Background.java +++ b/tests/tapl/com/android/launcher3/tapl/Background.java @@ -62,7 +62,7 @@ public class Background extends LauncherInstrumentation.VisibleContainer { final int height = mLauncher.getDevice().getDisplayHeight(); final UiObject2 navBar = mLauncher.getSystemUiObject("navigation_bar_frame"); - int swipeLength = Math.round(100 * mLauncher.getDisplayDensity()); + int swipeLength = Math.round(getSwipeLength() * mLauncher.getDisplayDensity()); mLauncher.swipe( navBar.getVisibleBounds().centerX(), navBar.getVisibleBounds().centerY(), navBar.getVisibleBounds().centerX(), height - swipeLength, @@ -71,4 +71,8 @@ public class Background extends LauncherInstrumentation.VisibleContainer { mLauncher.getSystemUiObject("recent_apps").click(); } } + + protected int getSwipeLength() { + return 200; + } } diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index f597133ed8..5cd41f981f 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -160,4 +160,9 @@ public final class Workspace extends Home { mLauncher.getDevice().pressKeyCode(KeyEvent.KEYCODE_W, KeyEvent.META_CTRL_ON); return new Widgets(mLauncher); } + + @Override + protected int getSwipeLength() { + return 100; + } } \ No newline at end of file