diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-03-27 16:03:06 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2019-04-16 00:08:24 -0700 |
commit | 9589916418d8892fcd99b3abb9770ae83ebec7d8 (patch) | |
tree | ad71a549bf1538ed9980912f6912f93808a61218 /tests | |
parent | 1f457ae87f05f76ead7f064e93e4473abe840828 (diff) | |
download | android_packages_apps_Trebuchet-9589916418d8892fcd99b3abb9770ae83ebec7d8.tar.gz android_packages_apps_Trebuchet-9589916418d8892fcd99b3abb9770ae83ebec7d8.tar.bz2 android_packages_apps_Trebuchet-9589916418d8892fcd99b3abb9770ae83ebec7d8.zip |
ShortcutInfo renamed to WorkspaceItemInfo
Will get rid of ShortcutInfoCompat in a follow up cl
Change-Id: I7d7d9c938635f59b216290ba28bea9d0e0721a7d
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/launcher3/model/LoaderCursorTest.java | 8 | ||||
-rw-r--r-- | tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/com/android/launcher3/model/LoaderCursorTest.java b/tests/src/com/android/launcher3/model/LoaderCursorTest.java index df935b8db..7d60ad65b 100644 --- a/tests/src/com/android/launcher3/model/LoaderCursorTest.java +++ b/tests/src/com/android/launcher3/model/LoaderCursorTest.java @@ -10,11 +10,11 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.launcher3.WorkspaceItemInfo; import com.android.launcher3.icons.IconCache; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.ItemInfo; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.ShortcutInfo; import com.android.launcher3.Utilities; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.icons.BitmapInfo; @@ -112,7 +112,7 @@ public class LoaderCursorTest { ComponentName cn = mLauncherApps.getActivityList(null, mLoaderCursor.user) .get(0).getComponentName(); - ShortcutInfo info = mLoaderCursor.getAppShortcutInfo( + WorkspaceItemInfo info = mLoaderCursor.getAppShortcutInfo( new Intent().setComponent(cn), false /* allowMissingTarget */, true); assertNotNull(info); assertTrue(Utilities.isLauncherAppTarget(info.intent)); @@ -124,7 +124,7 @@ public class LoaderCursorTest { assertTrue(mLoaderCursor.moveToNext()); ComponentName cn = new ComponentName(mContext.getPackageName(), "dummy-do"); - ShortcutInfo info = mLoaderCursor.getAppShortcutInfo( + WorkspaceItemInfo info = mLoaderCursor.getAppShortcutInfo( new Intent().setComponent(cn), true /* allowMissingTarget */, true); assertNotNull(info); assertTrue(Utilities.isLauncherAppTarget(info.intent)); @@ -138,7 +138,7 @@ public class LoaderCursorTest { Bitmap icon = Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8); when(mMockIconCache.getDefaultIcon(eq(mLoaderCursor.user))) .thenReturn(BitmapInfo.fromBitmap(icon)); - ShortcutInfo info = mLoaderCursor.loadSimpleShortcut(); + WorkspaceItemInfo info = mLoaderCursor.loadSimpleWorkspaceItem(); assertEquals(icon, info.iconBitmap); assertEquals("my-shortcut", info.title); assertEquals(ITEM_TYPE_SHORTCUT, info.itemType); diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java index 95a128961..4899334e2 100644 --- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java +++ b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java @@ -34,7 +34,7 @@ import com.android.launcher3.ItemInfo; import com.android.launcher3.LauncherAppWidgetInfo; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.R; -import com.android.launcher3.ShortcutInfo; +import com.android.launcher3.WorkspaceItemInfo; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace.ItemOperator; import com.android.launcher3.shortcuts.ShortcutKey; @@ -134,7 +134,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { runTest("pinShortcut", false, new ItemOperator() { @Override public boolean evaluate(ItemInfo info, View view) { - return info instanceof ShortcutInfo && + return info instanceof WorkspaceItemInfo && info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT && ShortcutKey.fromItemInfo(info).getId().equals(mShortcutId); } |