diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java index d531339f80..f7528225f6 100644 --- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java +++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java @@ -58,12 +58,6 @@ public class QuickstepTestInformationHandler extends TestInformationHandler { FeatureFlags.ENABLE_OVERVIEW_SHARE.get()); return response; } - - case TestProtocol.REQUEST_OVERVIEW_CONTENT_PUSH_ENABLED: { - response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, - FeatureFlags.ENABLE_OVERVIEW_CONTENT_PUSH.get()); - return response; - } } return super.call(method, arg); diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 49e0171de1..e89549dd80 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -166,9 +166,6 @@ public final class FeatureFlags { "ENABLE_OVERVIEW_SHARING_TO_PEOPLE", true, "Show indicators for content on Overview to share with top people. "); - public static final BooleanFlag ENABLE_OVERVIEW_CONTENT_PUSH = getDebugFlag( - "ENABLE_OVERVIEW_CONTENT_PUSH", false, "Show Content Push button in Overview Actions"); - public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag( "ENABLE_DATABASE_RESTORE", false, "Enable database restore when new restore session is created"); diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 9e52dacba5..232acd925c 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -111,8 +111,6 @@ public final class TestProtocol { public static final String REQUEST_DISABLE_DEBUG_TRACING = "disable-debug-tracing"; public static final String REQUEST_OVERVIEW_SHARE_ENABLED = "overview-share-enabled"; - public static final String REQUEST_OVERVIEW_CONTENT_PUSH_ENABLED = - "overview-content-push-enabled"; public static boolean sDisableSensorRotation; public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation"; diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 0360a7d00a..69c97c5a65 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -1460,11 +1460,6 @@ public final class LauncherInstrumentation { TestProtocol.TEST_INFO_RESPONSE_FIELD); } - boolean overviewContentPushEnabled() { - return getTestInfo(TestProtocol.REQUEST_OVERVIEW_CONTENT_PUSH_ENABLED).getBoolean( - TestProtocol.TEST_INFO_RESPONSE_FIELD); - } - private void disableSensorRotation() { getTestInfo(TestProtocol.REQUEST_MOCK_SENSOR_ROTATION); } diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewActions.java b/tests/tapl/com/android/launcher3/tapl/OverviewActions.java index 950c052636..aa4cc4c7f4 100644 --- a/tests/tapl/com/android/launcher3/tapl/OverviewActions.java +++ b/tests/tapl/com/android/launcher3/tapl/OverviewActions.java @@ -33,27 +33,6 @@ public class OverviewActions { this.mLauncher = launcherInstrumentation; } - /** - * Clicks content push button. - */ - @NonNull - public Overview clickAndDismissContentPush() { - if (mLauncher.overviewContentPushEnabled()) { - try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck(); - LauncherInstrumentation.Closable c = mLauncher.addContextLayer( - "want to click content push button and exit screenshot ui")) { - UiObject2 exo = mLauncher.waitForObjectInContainer(mOverviewActions, - "action_content_push"); - mLauncher.clickLauncherObject(exo); - try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer( - "clicked content push button")) { - return new Overview(mLauncher); - } - } - } - return new Overview(mLauncher); - } - /** * Clicks screenshot button and closes screenshot ui. */