From d7fdcab612d9c8136283ea432a24800a9cdbfdc8 Mon Sep 17 00:00:00 2001 From: Pinyao Ting Date: Thu, 3 Oct 2019 10:15:30 -0700 Subject: correct naming and add comments for test case of custom shortcut. Bug: 141934188 Change-Id: I69ce5f05214df10e2a376ff68c713efe8874df15 --- tests/AndroidManifest-common.xml | 2 +- .../CustomShortcutConfigActivity.java | 66 ++++++++++++++++++++++ .../ShortcutWidgetConfigActivity.java | 62 -------------------- .../android/launcher3/ui/TaplTestsLauncher3.java | 11 +++- 4 files changed, 76 insertions(+), 65 deletions(-) create mode 100644 tests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java delete mode 100644 tests/src/com/android/launcher3/testcomponent/ShortcutWidgetConfigActivity.java (limited to 'tests') 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 @@ - + diff --git a/tests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java b/tests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java new file mode 100644 index 000000000..b673faa6f --- /dev/null +++ b/tests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.testcomponent; + +import android.content.Context; +import android.content.Intent; +import android.content.pm.ShortcutInfo; +import android.content.pm.ShortcutManager; +import android.graphics.drawable.Icon; +import android.os.Bundle; + +import com.android.launcher3.R; + +import java.util.UUID; + +/** + * 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) { + super.onCreate(savedInstanceState); + + Intent launchIntent = new Intent(this, BaseTestingActivity.class) + .setAction("com.android.launcher3.intent.action.test_shortcut"); + Intent shortcutIntent = createShortcutResultIntent( + this, UUID.randomUUID().toString(), "Shortcut", + R.drawable.ic_widget, launchIntent); + setResult(RESULT_OK, shortcutIntent); + finish(); + } + + private static Intent createShortcutResultIntent( + Context context, String uniqueId, String name, int iconId, Intent launchIntent) { + ShortcutInfo shortcutInfo = + createShortcutInfo(context, uniqueId, name, iconId, launchIntent); + ShortcutManager sm = context.getSystemService(ShortcutManager.class); + return sm.createShortcutResultIntent(shortcutInfo); + } + + private static ShortcutInfo createShortcutInfo( + Context context, String uniqueId, String name, int iconId, Intent launchIntent) { + return new ShortcutInfo.Builder(context, uniqueId) + .setShortLabel(name) + .setLongLabel(name) + .setIcon(Icon.createWithResource(context, iconId)) + .setIntent(launchIntent) + .build(); + } +} diff --git a/tests/src/com/android/launcher3/testcomponent/ShortcutWidgetConfigActivity.java b/tests/src/com/android/launcher3/testcomponent/ShortcutWidgetConfigActivity.java deleted file mode 100644 index f9d5f2d43..000000000 --- a/tests/src/com/android/launcher3/testcomponent/ShortcutWidgetConfigActivity.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.launcher3.testcomponent; - -import android.content.Context; -import android.content.Intent; -import android.content.pm.ShortcutInfo; -import android.content.pm.ShortcutManager; -import android.graphics.drawable.Icon; -import android.os.Bundle; - -import com.android.launcher3.R; - -import java.util.UUID; - -public class ShortcutWidgetConfigActivity extends BaseTestingActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - Intent launchIntent = new Intent(this, BaseTestingActivity.class) - .setAction("com.android.launcher3.intent.action.test_shortcut"); - Intent shortcutIntent = createShortcutResultIntent( - this, UUID.randomUUID().toString(), "Shortcut", - R.drawable.ic_widget, launchIntent); - setResult(RESULT_OK, shortcutIntent); - finish(); - } - - private static Intent createShortcutResultIntent( - Context context, String uniqueId, String name, int iconId, Intent launchIntent) { - ShortcutInfo shortcutInfo = - createShortcutInfo(context, uniqueId, name, iconId, launchIntent); - ShortcutManager sm = context.getSystemService(ShortcutManager.class); - return sm.createShortcutResultIntent(shortcutInfo); - } - - private static ShortcutInfo createShortcutInfo( - Context context, String uniqueId, String name, int iconId, Intent launchIntent) { - return new ShortcutInfo.Builder(context, uniqueId) - .setShortLabel(name) - .setLongLabel(name) - .setIcon(Icon.createWithResource(context, iconId)) - .setIntent(launchIntent) - .build(); - } -} 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()); -- cgit v1.2.3