Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58a11ac9 authored by Alex Chau's avatar Alex Chau
Browse files

Expect state transition to overview while holding the swipe from home

- When swiping from home to overview, overview launches while the finger is still holding the gesture, which is different from swiping from app to overview

Bug: 193440212
Test: TaplTestQuickStep.testOverview and TaplTestQuickStep.testBackground
Change-Id: Ie45e9cb5e599175a56ed368bef107b84db919a34
parent 6224eaea
Loading
Loading
Loading
Loading
+30 −15
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
        return mLauncher.isTablet();
    }

    protected boolean zeroButtonToOverviewGestureStateTransitionWhileHolding() {
        return false;
    }

    protected void goToOverviewUnchecked() {
        switch (mLauncher.getNavigationModel()) {
            case ZERO_BUTTON: {
@@ -90,21 +94,32 @@ public class Background extends LauncherInstrumentation.VisibleContainer {

                mLauncher.sendPointer(
                        downTime, downTime, MotionEvent.ACTION_DOWN, start, gestureScope);
                mLauncher.executeAndWaitForLauncherEvent(
                        () -> mLauncher.movePointer(
                Runnable swipeAndHold = () -> mLauncher.movePointer(
                        downTime,
                        downTime,
                        ZERO_BUTTON_SWIPE_UP_GESTURE_DURATION,
                        start,
                        end,
                                gestureScope),
                        event -> TestProtocol.PAUSE_DETECTED_MESSAGE.equals(event.getClassName()),
                        () -> "Pause wasn't detected", "swiping and holding");
                mLauncher.runToState(
                        () -> mLauncher.sendPointer(
                        gestureScope);
                String swipeAndHoldAction = "swiping and holding";
                Runnable up = () -> mLauncher.sendPointer(
                        downTime, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, end,
                                gestureScope),
                        OVERVIEW_STATE_ORDINAL, "sending UP event");
                        gestureScope);
                String upAction = "sending UP event";
                if (zeroButtonToOverviewGestureStateTransitionWhileHolding()) {
                    mLauncher.runToState(swipeAndHold, OVERVIEW_STATE_ORDINAL, swipeAndHoldAction);
                    try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(upAction)) {
                        up.run();
                    }
                } else {
                    mLauncher.executeAndWaitForLauncherEvent(
                            swipeAndHold,
                            event -> TestProtocol.PAUSE_DETECTED_MESSAGE.equals(
                                    event.getClassName()),
                            () -> "Pause wasn't detected",
                            swipeAndHoldAction);
                    mLauncher.runToState(up, OVERVIEW_STATE_ORDINAL, upAction);
                }
                break;
            }

+4 −0
Original line number Diff line number Diff line
@@ -63,4 +63,8 @@ public abstract class Home extends Background {
        return true;
    }

    @Override
    protected boolean zeroButtonToOverviewGestureStateTransitionWhileHolding() {
        return true;
    }
}
 No newline at end of file