summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-11-30 16:42:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-11-30 16:42:31 +0000
commitb7f5431232f8f22ccb0d9f3d4ec5992d6776fd0d (patch)
tree6936e24d059ff06cf9c49bb7e5fa24547a2c9260 /tests
parent70fc828256e838befa80da97bbf159067f022cb9 (diff)
parent2bcbe13c642efa4c94df570441c700b7aa8e353d (diff)
downloadandroid_packages_apps_Trebuchet-b7f5431232f8f22ccb0d9f3d4ec5992d6776fd0d.tar.gz
android_packages_apps_Trebuchet-b7f5431232f8f22ccb0d9f3d4ec5992d6776fd0d.tar.bz2
android_packages_apps_Trebuchet-b7f5431232f8f22ccb0d9f3d4ec5992d6776fd0d.zip
Merge "Moving ShortcutInfo creation in InstallShortcutReceiver to background thread" into ub-launcher3-master
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java
index ecb3782fc..b2f0cbbbc 100644
--- a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java
+++ b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java
@@ -15,6 +15,7 @@ import com.android.launcher3.ShortcutInfo;
import com.android.launcher3.config.ProviderConfig;
import com.android.launcher3.util.GridOccupancy;
import com.android.launcher3.util.LongArrayMap;
+import com.android.launcher3.util.Provider;
import org.mockito.ArgumentCaptor;
@@ -48,8 +49,8 @@ public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase {
idp.numRows = 5;
}
- private <T extends ItemInfo> AddWorkspaceItemsTask newTask(T... items) {
- return new AddWorkspaceItemsTask(new ArrayList<>(Arrays.asList(items))) {
+ private AddWorkspaceItemsTask newTask(ItemInfo... items) {
+ return new AddWorkspaceItemsTask(Provider.of(Arrays.asList(items))) {
@Override
protected void addItemToDatabase(Context context, ItemInfo item,