Merge "fix custom shortcut test" into ub-launcher3-qt-future-dev (f7b75392) · Commits · e / os / android_packages_apps_Trebuchet

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -342,23 +342,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
		}
		}

		/**
		* Test dragging a custom shortcut to the workspace and launch it.
		*
		* A custom shortcut is a 1x1 widget that launches a specific intent when user tap on it.
		* Custom shortcuts are replaced by deep shortcuts after api 25.
		*/
		@Test
		@Ignore // b/143725213
		@PortraitLandscape
		public void testDragCustomShortcut() {
		mLauncher.getWorkspace().openAllWidgets()
		.getWidget("com.android.launcher3.testcomponent.CustomShortcutConfigActivity")
		.dragToWorkspace();
		mLauncher.getWorkspace().getWorkspaceAppIcon("Shortcut")
		.launch(getAppPackageName());
		}

		public static String getAppPackageName() {
		return getInstrumentation().getContext().getPackageName();
		}

+18 −0

Original line number	Diff line number	Diff line
		@@ -69,4 +69,22 @@ public class AddWidgetTest extends AbstractLauncherUiTest {
		assertNotNull("Widget not found on the workspace", widget);
		widget.launch(getAppPackageName());
		}

		/**
		* Test dragging a custom shortcut to the workspace and launch it.
		*
		* A custom shortcut is a 1x1 widget that launches a specific intent when user tap on it.
		* Custom shortcuts are replaced by deep shortcuts after api 25.
		*/
		@Test
		@PortraitLandscape
		public void testDragCustomShortcut() throws Throwable {
		clearHomescreen();
		mDevice.pressHome();
		mLauncher.getWorkspace().openAllWidgets()
		.getWidget("com.android.launcher3.testcomponent.CustomShortcutConfigActivity")
		.dragToWorkspace();
		mLauncher.getWorkspace().getWorkspaceAppIcon("Shortcut")
		.launch(getAppPackageName());
		}
		}