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 /src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java | |
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 'src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java')
-rw-r--r-- | src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java b/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java index 1c088dbdd..17daeb84e 100644 --- a/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java +++ b/src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java @@ -27,7 +27,7 @@ import com.android.launcher3.FolderInfo; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.R; -import com.android.launcher3.ShortcutInfo; +import com.android.launcher3.WorkspaceItemInfo; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.DragType; import com.android.launcher3.dragndrop.DragLayer; @@ -106,7 +106,7 @@ public class WorkspaceAccessibilityHelper extends DragAndDropAccessibilityDelega // For icons, we can consider cells that have another icon or a folder. ItemInfo info = (ItemInfo) child.getTag(); if (info instanceof AppInfo || info instanceof FolderInfo || - info instanceof ShortcutInfo) { + info instanceof WorkspaceItemInfo) { return id; } } @@ -125,7 +125,7 @@ public class WorkspaceAccessibilityHelper extends DragAndDropAccessibilityDelega return mContext.getString(R.string.item_moved); } else { ItemInfo info = (ItemInfo) child.getTag(); - if (info instanceof AppInfo || info instanceof ShortcutInfo) { + if (info instanceof AppInfo || info instanceof WorkspaceItemInfo) { return mContext.getString(R.string.folder_created); } else if (info instanceof FolderInfo) { @@ -170,14 +170,14 @@ public class WorkspaceAccessibilityHelper extends DragAndDropAccessibilityDelega public static String getDescriptionForDropOver(View overChild, Context context) { ItemInfo info = (ItemInfo) overChild.getTag(); - if (info instanceof ShortcutInfo) { + if (info instanceof WorkspaceItemInfo) { return context.getString(R.string.create_folder_with, info.title); } else if (info instanceof FolderInfo) { if (TextUtils.isEmpty(info.title)) { // Find the first item in the folder. FolderInfo folder = (FolderInfo) info; - ShortcutInfo firstItem = null; - for (ShortcutInfo shortcut : folder.contents) { + WorkspaceItemInfo firstItem = null; + for (WorkspaceItemInfo shortcut : folder.contents) { if (firstItem == null || firstItem.rank > shortcut.rank) { firstItem = shortcut; } |