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

Commit 0940399f authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Reset the frozen recents list state when switching to button navigation" into main

parents 068d1ea8 8bbfc2b6
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ import static com.android.systemui.shared.system.QuickStepContract.NAV_BAR_MODE_

import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.Point;
import android.os.SystemClock;
import android.util.Log;
import android.view.MotionEvent;

import androidx.test.uiautomator.UiDevice;

@@ -115,6 +118,18 @@ public class NavigationModeSwitchRule implements TestRule {
                private void evaluateWithThreeButtons() throws Throwable {
                    if (setActiveOverlay(mLauncher, NAV_BAR_MODE_3BUTTON_OVERLAY,
                            LauncherInstrumentation.NavigationModel.THREE_BUTTON, description)) {
                        // After switching to three button, ensure that we interact with the screen
                        // within the app area to reset the frozen recents state (if a quickswitch
                        // was just performed), otherwise the list may be in the wrong order
                        // spatially when executing the next test
                        final Point center = new Point(mLauncher.getDevice().getDisplayWidth() / 2,
                                mLauncher.getDevice().getDisplayHeight() / 2);
                        final long clickTime = SystemClock.uptimeMillis();
                        mLauncher.sendPointer(clickTime, clickTime, MotionEvent.ACTION_DOWN, center,
                                LauncherInstrumentation.GestureScope.DONT_EXPECT_PILFER);
                        mLauncher.sendPointer(clickTime, clickTime, MotionEvent.ACTION_UP, center,
                                LauncherInstrumentation.GestureScope.DONT_EXPECT_PILFER);

                        base.evaluate();
                    }
                }