diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java index 4750caafe9..05c206f179 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java @@ -36,7 +36,7 @@ public abstract class DelegateInputConsumer implements InputConsumer { protected void setActive(MotionEvent ev) { mState = STATE_ACTIVE; - TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); + TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "pilferPointers"); mInputMonitor.pilferPointers(); // Send cancel event diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java index 7b8d40c911..ba1d38cf6a 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java @@ -204,7 +204,7 @@ public class DeviceLockedInputConsumer implements InputConsumer, private void startRecentsTransition() { mThresholdCrossed = true; - TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); + TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "pilferPointers"); mInputMonitorCompat.pilferPointers(); Intent intent = new Intent(Intent.ACTION_MAIN) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java index 42f6ff57ec..8e7074d237 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java @@ -309,7 +309,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC if (mInteractionHandler == null) { return; } - TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); + TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "pilferPointers"); mInputMonitorCompat.pilferPointers(); mActivityInterface.closeOverlay(); diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java index 6bfabcdd84..f161cc0fd6 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java @@ -108,7 +108,7 @@ public class OverviewInputConsumer ActiveGestureLog.INSTANCE.addLog("startQuickstep"); } if (mInputMonitor != null) { - TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); + TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "pilferPointers"); mInputMonitor.pilferPointers(); } } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java index ac1c3a8742..823b254d80 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java @@ -65,7 +65,7 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer { private void onInterceptTouch() { if (mInputMonitor != null) { - TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); + TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "pilferPointers"); mInputMonitor.pilferPointers(); } } diff --git a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java index 5904fcd691..8e4762da7f 100644 --- a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java +++ b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java @@ -88,6 +88,7 @@ public class AppPredictionsUITests extends AbstractQuickStepTest { */ @Test public void testPredictionExistsInAllApps() { + mDevice.pressHome(); mLauncher.pressHome().switchToAllApps(); // Dispatch an update diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 1743b14cc4..33f5a9591b 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -941,7 +941,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, // Workaround for b/78520668, explicitly trim memory once UI is hidden onTrimMemory(TRIM_MEMORY_UI_HIDDEN); - TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "Activity.onStop"); } @Override @@ -955,7 +954,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, mAppWidgetHost.setListenIfResumed(true); TraceHelper.INSTANCE.endSection(traceToken); - TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "Activity.onStart"); } private void handleDeferredResume() { diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 05d365b18a..f995c61ac9 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -35,7 +35,6 @@ public final class TestProtocol { public static final String TAPL_EVENTS_TAG = "TaplEvents"; public static final String SEQUENCE_MAIN = "Main"; public static final String SEQUENCE_TIS = "TIS"; - public static final String SEQUENCE_PILFER = "Pilfer"; public static String stateOrdinalToString(int ordinal) { switch (ordinal) { diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java index 8972876856..2acab97454 100644 --- a/tests/tapl/com/android/launcher3/tapl/Background.java +++ b/tests/tapl/com/android/launcher3/tapl/Background.java @@ -72,7 +72,6 @@ public class Background extends LauncherInstrumentation.VisibleContainer { } protected void goToOverviewUnchecked() { - final boolean launcherWasVisible = mLauncher.isLauncherVisible(); switch (mLauncher.getNavigationModel()) { case ZERO_BUTTON: { final int centerX = mLauncher.getDevice().getDisplayWidth() / 2; @@ -138,10 +137,6 @@ public class Background extends LauncherInstrumentation.VisibleContainer { OVERVIEW_STATE_ORDINAL); break; } - if (!launcherWasVisible) { - mLauncher.expectEvent( - TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_START_ACTIVITY); - } } /** @@ -162,7 +157,6 @@ public class Background extends LauncherInstrumentation.VisibleContainer { } protected void quickSwitchToPreviousApp(int expectedState) { - final boolean launcherWasVisible = mLauncher.isLauncherVisible(); boolean transposeInLandscape = false; switch (mLauncher.getNavigationModel()) { case TWO_BUTTON: @@ -186,17 +180,15 @@ public class Background extends LauncherInstrumentation.VisibleContainer { endX = startX; endY = 0; } + final boolean launcherIsVisible = + mLauncher.hasLauncherObject(By.textStartsWith("")); final boolean isZeroButton = mLauncher.getNavigationModel() == LauncherInstrumentation.NavigationModel.ZERO_BUTTON; - if (!launcherWasVisible) { - mLauncher.expectEvent( - TestProtocol.SEQUENCE_MAIN, - LauncherInstrumentation.EVENT_START_ACTIVITY); - } mLauncher.swipeToState(startX, startY, endX, endY, 20, expectedState, - launcherWasVisible && isZeroButton + launcherIsVisible && isZeroButton ? LauncherInstrumentation.GestureScope.INSIDE_TO_OUTSIDE - : LauncherInstrumentation.GestureScope.OUTSIDE); + : LauncherInstrumentation.GestureScope.OUTSIDE + ); break; } @@ -204,11 +196,6 @@ public class Background extends LauncherInstrumentation.VisibleContainer { // Double press the recents button. UiObject2 recentsButton = mLauncher.waitForSystemUiObject("recent_apps"); mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT); - if (!launcherWasVisible) { - mLauncher.expectEvent( - TestProtocol.SEQUENCE_MAIN, - LauncherInstrumentation.EVENT_START_ACTIVITY); - } mLauncher.runToState(() -> recentsButton.click(), OVERVIEW_STATE_ORDINAL); mLauncher.getOverview(); mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SQUARE_BUTTON_EVENT); @@ -216,8 +203,6 @@ public class Background extends LauncherInstrumentation.VisibleContainer { break; } mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT); - mLauncher.expectEvent( - TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_STOP_ACTIVITY); } protected String getSwipeHeightRequestName() { diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java index 0f65ba5efa..b20384ef6b 100644 --- a/tests/tapl/com/android/launcher3/tapl/Launchable.java +++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java @@ -25,8 +25,6 @@ import androidx.test.uiautomator.BySelector; import androidx.test.uiautomator.UiObject2; import androidx.test.uiautomator.Until; -import com.android.launcher3.testing.TestProtocol; - /** * Ancestor for AppIcon and AppMenuItem. */ @@ -64,8 +62,6 @@ abstract class Launchable { event -> event.getEventType() == TYPE_WINDOW_STATE_CHANGED, () -> "Launching an app didn't open a new window: " + mObject.getText()); expectActivityStartEvents(); - mLauncher.expectEvent( - TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_STOP_ACTIVITY); mLauncher.assertTrue( "App didn't start: " + selector, diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 1ec5b68f74..43ef830a8a 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -97,8 +97,6 @@ public final class LauncherInstrumentation { private 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_ACTIVITY = Pattern.compile("Activity\\.onStart"); - static final Pattern EVENT_STOP_ACTIVITY = Pattern.compile("Activity\\.onStop"); static final Pattern EVENT_TOUCH_DOWN_TIS = getTouchEventPatternTIS("ACTION_DOWN"); static final Pattern EVENT_TOUCH_UP_TIS = getTouchEventPatternTIS("ACTION_UP"); @@ -611,7 +609,6 @@ public final class LauncherInstrumentation { // otherwise waitForIdle may return immediately in case when there was a big enough // pause in accessibility events prior to pressing Home. final String action; - final boolean launcherWasVisible = isLauncherVisible(); if (getNavigationModel() == NavigationModel.ZERO_BUTTON) { checkForAnomaly(); @@ -640,18 +637,12 @@ public final class LauncherInstrumentation { displaySize.x / 2, displaySize.y - 1, displaySize.x / 2, 0, ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME, NORMAL_STATE_ORDINAL, - launcherWasVisible + hasLauncherObject(By.textStartsWith("")) ? GestureScope.INSIDE_TO_OUTSIDE : GestureScope.OUTSIDE); } - if (!launcherWasVisible) { - expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_START_ACTIVITY); - } } } else { - if (!launcherWasVisible) { - expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_START_ACTIVITY); - } log("Hierarchy before clicking home:"); dumpViewHierarchy(); log(action = "clicking home button from " + getVisibleStateMessage()); @@ -662,7 +653,6 @@ public final class LauncherInstrumentation { expectEvent(TestProtocol.SEQUENCE_TIS, EVENT_TOUCH_DOWN_TIS); expectEvent(TestProtocol.SEQUENCE_TIS, EVENT_TOUCH_UP_TIS); } - runToState( waitForSystemUiObject("home")::click, NORMAL_STATE_ORDINAL, @@ -679,10 +669,6 @@ public final class LauncherInstrumentation { } } - boolean isLauncherVisible() { - return hasLauncherObject(By.textStartsWith("")); - } - /** * Gets the Workspace object if the current state is "active home", i.e. workspace. Fails if the * launcher is not in that state. @@ -1101,7 +1087,7 @@ public final class LauncherInstrumentation { break; case MotionEvent.ACTION_UP: if (gestureScope != GestureScope.INSIDE) { - expectEvent(TestProtocol.SEQUENCE_PILFER, EVENT_PILFER_POINTERS); + expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_PILFER_POINTERS); } if (gestureScope != GestureScope.OUTSIDE) { expectEvent(TestProtocol.SEQUENCE_MAIN, gestureScope == GestureScope.INSIDE diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java index 5c51782826..f955cf23c9 100644 --- a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java +++ b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java @@ -79,8 +79,6 @@ public final class OverviewTask { () -> "Launching task didn't open a new window: " + mTask.getParent().getContentDescription()); mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT); - mLauncher.expectEvent( - TestProtocol.SEQUENCE_MAIN, LauncherInstrumentation.EVENT_STOP_ACTIVITY); } return new Background(mLauncher); }