Merge "correct naming and add comments for test case of custom shortcut." into... (055c22e8) · Commits · e / os / android_packages_apps_Trebuchet

tests/AndroidManifest-common.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@
		<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
		</intent-filter>
		</activity>
		<activity android:name="com.android.launcher3.testcomponent.ShortcutWidgetConfigActivity">
		<activity android:name="com.android.launcher3.testcomponent.CustomShortcutConfigActivity">
		<intent-filter>
		<action android:name="android.intent.action.CREATE_SHORTCUT" />
		<category android:name="android.intent.category.DEFAULT" />

+5 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,11 @@ import com.android.launcher3.R;

		import java.util.UUID;

		public class ShortcutWidgetConfigActivity extends BaseTestingActivity {
		/**
		* 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.
		*/
		public class CustomShortcutConfigActivity extends BaseTestingActivity {

		@Override
		protected void onCreate(Bundle savedInstanceState) {

+9 −2

Original line number	Diff line number	Diff line
		@@ -342,10 +342,17 @@ 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
		public void testDragShortcutWidget() {
		@PortraitLandscape
		public void testDragCustomShortcut() {
		mLauncher.getWorkspace().openAllWidgets()
		.getWidget("com.android.launcher3.testcomponent.ShortcutWidgetConfigActivity")
		.getWidget("com.android.launcher3.testcomponent.CustomShortcutConfigActivity")
		.dragToWorkspace();
		mLauncher.getWorkspace().getWorkspaceAppIcon("Shortcut")
		.launch(getAppPackageName());