commit 734574221b9451764c65f005a1621e351650af06
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 06 04:40:41 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 06 04:40:41 2019 +0000
tree 29c6cf5b8416cc6aaa1d1538a2cb703628be2f06
parent 37b2489ff7a567ef45319d12a149d3dec772931a
parent 1b9e540a5290735dad63f69074497fb6540b00ff

Merge "Fix icons vanishing when dragged within folder" into ub-launcher3-qt-future-dev

src/com/android/launcher3/folder/FolderPagedView.java

diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index 54b363e..3b5fd59 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -277,6 +277,7 @@
             page.removeAllViews();
             pages.add(page);
         }
+        mOrganizer.setFolderInfo(mFolder.getInfo());
         setupContentDimensions(itemCount);
 
         Iterator<CellLayout> pageItr = pages.iterator();
@@ -285,7 +286,6 @@
         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()) {