diff options
author | Jon Miranda <jonmiranda@google.com> | 2017-06-25 18:37:39 -0700 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2017-06-28 09:52:11 -0700 |
commit | 69c340a05e846b4b1b2d457164fd313e249df353 (patch) | |
tree | 5bdc2b4185a2f9a8f886053ab81cca9f8d056c55 /src/com/android/launcher3/Workspace.java | |
parent | aa2272f81cc4a62f847db777efda7959cc2b9979 (diff) | |
download | android_packages_apps_Trebuchet-69c340a05e846b4b1b2d457164fd313e249df353.tar.gz android_packages_apps_Trebuchet-69c340a05e846b4b1b2d457164fd313e249df353.tar.bz2 android_packages_apps_Trebuchet-69c340a05e846b4b1b2d457164fd313e249df353.zip |
Match items in icon preview with items in Folder using permutations.
Before, with the FolderIconPreviewVerifier, we would
adjust which items are displayed in the FolderIcon.
This caused some issues where the apps in the folder
icon would jump to whatever was in the upper left quadrant.
Now, we always display the 4 first items in the icon by
modifying the XY positions of the items within the Folder.
Bug: 27944225
Bug: 35064148
Change-Id: I46c0fbb064d4da4da155e29963bfb92b14e40f07
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 919c60a34..b1db7e8db 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3792,7 +3792,7 @@ public class Workspace extends PagedView ItemInfo info = (ItemInfo) item.getTag(); if (recurse && info instanceof FolderInfo && item instanceof FolderIcon) { FolderIcon folder = (FolderIcon) item; - ArrayList<View> folderChildren = folder.getFolder().getItemsInReadingOrder(); + ArrayList<View> folderChildren = folder.getFolder().getItemsInRankOrder(); // map over all the children in the folder final int childCount = folderChildren.size(); for (int childIdx = 0; childIdx < childCount; childIdx++) { |