Fix quick switch test gesture in landscape 2-button mode
am: a0f77c4449
Change-Id: I998081a53a94ff3b1559a7e77d4d470056cfab00
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 41f4a82..d270d76 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -248,6 +248,7 @@
@Test
@NavigationModeSwitch
@PortraitLandscape
+ @Ignore("Temporarily disabled b/140252765")
public void testQuickSwitchFromApp() throws Exception {
startAppFast(getAppPackageName());
startTestActivity(2);
diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java
index 8b5792c..0d9038f 100644
--- a/tests/tapl/com/android/launcher3/tapl/Background.java
+++ b/tests/tapl/com/android/launcher3/tapl/Background.java
@@ -137,15 +137,29 @@
}
protected void quickSwitchToPreviousApp(int expectedState) {
+ boolean transposeInLandscape = false;
switch (mLauncher.getNavigationModel()) {
- case ZERO_BUTTON:
+ case TWO_BUTTON:
+ transposeInLandscape = true;
// Fall through, zero button and two button modes behave the same.
- case TWO_BUTTON: {
- // Swipe from the bottom left to the bottom right of the screen.
- final int startX = 0;
- final int startY = getSwipeStartY();
- final int endX = mLauncher.getDevice().getDisplayWidth();
- final int endY = startY;
+ case ZERO_BUTTON: {
+ final int startX;
+ final int startY;
+ final int endX;
+ final int endY;
+ if (mLauncher.getDevice().isNaturalOrientation() || !transposeInLandscape) {
+ // Swipe from the bottom left to the bottom right of the screen.
+ startX = 0;
+ startY = getSwipeStartY();
+ endX = mLauncher.getDevice().getDisplayWidth();
+ endY = startY;
+ } else {
+ // Swipe from the bottom right to the top right of the screen.
+ startX = getSwipeStartX();
+ startY = mLauncher.getRealDisplaySize().y - 1;
+ endX = startX;
+ endY = 0;
+ }
mLauncher.swipeToState(startX, startY, endX, endY, 20, expectedState);
break;
}