diff options
author | Jon Miranda <jonmiranda@google.com> | 2019-05-02 08:55:38 -0700 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2019-05-02 08:55:38 -0700 |
commit | a9622f38cc4c4f2cebb1c2f99722efb455cf6812 (patch) | |
tree | 884842b731be09395c27eb999a75ac9c4127389a /src | |
parent | 35bda496f3086cd12820207802b14df3fbf4774c (diff) | |
download | android_packages_apps_Trebuchet-a9622f38cc4c4f2cebb1c2f99722efb455cf6812.tar.gz android_packages_apps_Trebuchet-a9622f38cc4c4f2cebb1c2f99722efb455cf6812.tar.bz2 android_packages_apps_Trebuchet-a9622f38cc4c4f2cebb1c2f99722efb455cf6812.zip |
Remove shortcuts/deepshortcuts as targets for swipe up to icon animation.
We'll add it back when b/129067201 is fixed.
Bug: 131809649
Change-Id: I6f009a84b86717f86394da6fb8540eb3f226419a
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index aa0917310..f1c183bb4 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2907,14 +2907,11 @@ public class Workspace extends PagedView<WorkspacePageIndicator> && info.user.equals(user); final Workspace.ItemOperator packageAndUserAndApp = (ItemInfo info, View view) -> packageAndUser.evaluate(info, view) && info.itemType == ITEM_TYPE_APPLICATION; - final Workspace.ItemOperator packageAndUserAndShortcut = (ItemInfo info, View view) -> - packageAndUser.evaluate(info, view) && (info.itemType == ITEM_TYPE_SHORTCUT - || info.itemType == ITEM_TYPE_DEEP_SHORTCUT); - final Workspace.ItemOperator packageAndUserInFolder = (info, view) -> { + final Workspace.ItemOperator packageAndUserAndAppInFolder = (info, view) -> { if (info instanceof FolderInfo) { FolderInfo folderInfo = (FolderInfo) info; for (WorkspaceItemInfo shortcutInfo : folderInfo.contents) { - if (packageAndUser.evaluate(shortcutInfo, view)) { + if (packageAndUserAndApp.evaluate(shortcutInfo, view)) { return true; } } @@ -2922,15 +2919,15 @@ public class Workspace extends PagedView<WorkspacePageIndicator> return false; }; - // Order: App icons, shortcuts, app/shortcut in folder. Items in hotseat get returned first. + // Order: App icons, app in folder. Items in hotseat get returned first. if (ADAPTIVE_ICON_WINDOW_ANIM.get()) { return getFirstMatch(new CellLayout[] { getHotseat(), currentPage }, - packageAndUserAndApp, packageAndUserAndShortcut, packageAndUserInFolder); + packageAndUserAndApp, packageAndUserAndAppInFolder); } else { // Do not use Folder as a criteria, since it'll cause a crash when trying to draw // FolderAdaptiveIcon as the background. return getFirstMatch(new CellLayout[] { getHotseat(), currentPage }, - packageAndUserAndApp, packageAndUserAndShortcut); + packageAndUserAndApp); } } |