PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add touch event of on taskbar for various cases" into sc-v2-dev am: 595893c33d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15095554

Change-Id: I475747b3a9836e305c2a1a44efcb3e828c3e5432
This commit is contained in:
Alex Chau
2021-06-25 08:58:43 +00:00
committed by Automerger Merge Worker
parent c9a2e5c693 595893c33d
commit 3a3375b0d2
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
+2
View File
@@ -25,6 +25,7 @@ import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.launcher3.Launcher;
import com.android.launcher3.ui.TaplTestsLauncher3;
import com.android.launcher3.util.RaceConditionReproducer;
import com.android.quickstep.NavigationModeSwitchRule.Mode;
import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
@@ -45,6 +46,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
@Before
public void setUp() throws Exception {
super.setUp();
TaplTestsLauncher3.initialize(this);
// b/143488140
mLauncher.pressHome();
// Start an activity where the gestures start.
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+3
View File
@@ -127,6 +127,9 @@ public abstract class AbstractLauncherUiTest {
}
public static void checkDetectedLeaks(LauncherInstrumentation launcher) {
// TODO(b/191449914): Temporarily disable leak detection on tablets until bug is resolved.
if (launcher.isTablet()) return;
if (sActivityLeakReported) return;
if (sStrictmodeDetectedActivityLeak != null) {
tests/tapl/com/android/launcher3/tapl/Background.java
+18
View File
@@ -134,6 +134,12 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
}
case THREE_BUTTON:
if (mLauncher.isTablet()) {
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN,
LauncherInstrumentation.EVENT_TOUCH_DOWN);
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN,
LauncherInstrumentation.EVENT_TOUCH_UP);
}
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
mLauncher.runToState(
() -> mLauncher.waitForNavigationUiObject("recent_apps").click(),
@@ -225,9 +231,21 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
case THREE_BUTTON:
// Double press the recents button.
UiObject2 recentsButton = mLauncher.waitForNavigationUiObject("recent_apps");
if (mLauncher.isTablet()) {
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN,
LauncherInstrumentation.EVENT_TOUCH_DOWN);
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN,
LauncherInstrumentation.EVENT_TOUCH_UP);
}
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
mLauncher.runToState(() -> recentsButton.click(), OVERVIEW_STATE_ORDINAL);
mLauncher.getOverview();
if (mLauncher.isTablet()) {
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN,
LauncherInstrumentation.EVENT_TOUCH_DOWN);
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN,
LauncherInstrumentation.EVENT_TOUCH_UP);
}
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT);
mLauncher.executeAndWaitForEvent(
() -> recentsButton.click(),
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+6 -2
View File
@@ -97,8 +97,8 @@ public final class LauncherInstrumentation {
private static final int ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME = 20;
private static final int GESTURE_STEP_MS = 16;
private static final Pattern EVENT_TOUCH_DOWN = getTouchEventPattern("ACTION_DOWN");
private static final Pattern EVENT_TOUCH_UP = getTouchEventPattern("ACTION_UP");
static final Pattern EVENT_TOUCH_DOWN = getTouchEventPattern("ACTION_DOWN");
static final Pattern EVENT_TOUCH_UP = getTouchEventPattern("ACTION_UP");
private static final Pattern EVENT_TOUCH_CANCEL = getTouchEventPattern("ACTION_CANCEL");
private static final Pattern EVENT_PILFER_POINTERS = Pattern.compile("pilferPointers");
static final Pattern EVENT_START = Pattern.compile("start:");
@@ -750,6 +750,10 @@ public final class LauncherInstrumentation {
expectEvent(TestProtocol.SEQUENCE_TIS, EVENT_TOUCH_DOWN_TIS);
expectEvent(TestProtocol.SEQUENCE_TIS, EVENT_TOUCH_UP_TIS);
}
if (isTablet()) {
expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_TOUCH_DOWN);
expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_TOUCH_UP);
}
runToState(
waitForNavigationUiObject("home")::click,