Merge "Remove Content Push prototype." into sc-v2-dev (c1359c44) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -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);

+0 −3

Original line number	Diff line number	Diff line
		@@ -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");

+0 −2

Original line number	Diff line number	Diff line
		@@ -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";

+0 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}

+0 −21

Original line number	Diff line number	Diff line
		@@ -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.
		*/