Merge "Re-enable swipe up view inflation test." into sc-dev (93e232a5) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import android.view.ViewConfiguration;
		import android.widget.RemoteViews;

		import androidx.test.filters.LargeTest;
		import androidx.test.filters.Suppress;
		import androidx.test.runner.AndroidJUnit4;
		import androidx.test.uiautomator.By;
		import androidx.test.uiautomator.UiDevice;
		@@ -79,10 +78,7 @@ import java.util.function.IntConsumer;
		* directly (ex: new LinearLayout)
		* Using ExtendedMockito: Mocking static methods from platform classes (loaded in zygote) makes
		* the main thread extremely slow and untestable
		*
		* Suppressed until b/141579810 is resolved
		*/
		@Suppress
		@LargeTest
		@RunWith(AndroidJUnit4.class)
		public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
		@@ -188,6 +184,11 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest {
		LauncherSettings.Settings.call(mResolver,
		LauncherSettings.Settings.METHOD_CLEAR_EMPTY_DB_FLAG);
		LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(this, false);
		// Make sure the widget is big enough to show a list of items
		info.minSpanX = 2;
		info.minSpanY = 2;
		info.spanX = 2;
		info.spanY = 2;
		LauncherAppWidgetInfo item = createWidgetInfo(info, getTargetContext(), true);

		addItemToScreen(item);

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ public final class FeatureFlags {

		// Keep as DeviceFlag to allow remote disable in emergency.
		public static final BooleanFlag ENABLE_SUGGESTED_ACTIONS_OVERVIEW = new DeviceFlag(
		"ENABLE_SUGGESTED_ACTIONS_OVERVIEW", true, "Show chip hints on the overview screen");
		"ENABLE_SUGGESTED_ACTIONS_OVERVIEW", false, "Show chip hints on the overview screen");


		public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(