diff options
author | Pinyao Ting <pinyaoting@google.com> | 2019-10-03 10:15:30 -0700 |
---|---|---|
committer | Pinyao Ting <pinyaoting@google.com> | 2019-10-03 10:15:30 -0700 |
commit | d7fdcab612d9c8136283ea432a24800a9cdbfdc8 (patch) | |
tree | 736bb72a0805b0818764ee4428a4cf892bcffefa /tests | |
parent | d625e49552a96d384745174ff6a137f1dd7837b7 (diff) | |
download | packages_apps_Trebuchet-d7fdcab612d9c8136283ea432a24800a9cdbfdc8.tar.gz packages_apps_Trebuchet-d7fdcab612d9c8136283ea432a24800a9cdbfdc8.tar.bz2 packages_apps_Trebuchet-d7fdcab612d9c8136283ea432a24800a9cdbfdc8.zip |
correct naming and add comments for test case of custom shortcut.
Bug: 141934188
Change-Id: I69ce5f05214df10e2a376ff68c713efe8874df15
Diffstat (limited to 'tests')
-rw-r--r-- | tests/AndroidManifest-common.xml | 2 | ||||
-rw-r--r-- | tests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java (renamed from tests/src/com/android/launcher3/testcomponent/ShortcutWidgetConfigActivity.java) | 6 | ||||
-rw-r--r-- | tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml index 6802152c7..ffa90b9c5 100644 --- a/tests/AndroidManifest-common.xml +++ b/tests/AndroidManifest-common.xml @@ -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" /> diff --git a/tests/src/com/android/launcher3/testcomponent/ShortcutWidgetConfigActivity.java b/tests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java index f9d5f2d43..b673faa6f 100644 --- a/tests/src/com/android/launcher3/testcomponent/ShortcutWidgetConfigActivity.java +++ b/tests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java @@ -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) { diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index 38dba1628..709822bbb 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -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()); |