summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-11-06 04:40:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-11-06 04:40:41 +0000
commit734574221b9451764c65f005a1621e351650af06 (patch)
tree29c6cf5b8416cc6aaa1d1538a2cb703628be2f06
parent37b2489ff7a567ef45319d12a149d3dec772931a (diff)
parent1b9e540a5290735dad63f69074497fb6540b00ff (diff)
downloadandroid_packages_apps_Trebuchet-734574221b9451764c65f005a1621e351650af06.tar.gz
android_packages_apps_Trebuchet-734574221b9451764c65f005a1621e351650af06.tar.bz2
android_packages_apps_Trebuchet-734574221b9451764c65f005a1621e351650af06.zip
Merge "Fix icons vanishing when dragged within folder" into ub-launcher3-qt-future-dev
-rw-r--r--src/com/android/launcher3/folder/FolderPagedView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index 54b363e90..3b5fd5902 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -277,6 +277,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
page.removeAllViews();
pages.add(page);
}
+ mOrganizer.setFolderInfo(mFolder.getInfo());
setupContentDimensions(itemCount);
Iterator<CellLayout> pageItr = pages.iterator();
@@ -285,7 +286,6 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
int position = 0;
int rank = 0;
- mOrganizer.setFolderInfo(mFolder.getInfo());
for (int i = 0; i < itemCount; i++) {
View v = list.size() > i ? list.get(i) : null;
if (currentPage == null || position >= mOrganizer.getMaxItemsPerPage()) {