commit 4e54a4cfa50838ea0a970fea2632851bcb16e2c0
author Jon Miranda <jonmiranda@google.com> Tue May 23 11:45:17 2017 -0700
committer Jon Miranda <jonmiranda@google.com> Tue May 23 11:45:17 2017 -0700
tree 60e5f7bd57e2ae8313139d0e86e552c61a870ead
parent db894b9bbad8169f1cae4b8ab88b37f79c2519c4

Fix bug where item was not moved in database when added to a Folder.

I thought calling arrangeChildren(saveChanges=true) would handle
this case, but because we set the position and rank in addViewForRank,
arrangeChildren does not see any changes to save.

Change-Id: Iab0fefe6da7711857ea05955a3243459f4e8527b

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

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 8dcf5c9..80338ca 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -1437,6 +1437,9 @@
     @Override
     public void onAdd(ShortcutInfo item, int rank) {
         View view = mContent.createAndAddViewForRank(item, rank);
+        mLauncher.getModelWriter().addOrMoveItemInDatabase(item, mInfo.id, 0, item.cellX,
+                item.cellY);
+
         ArrayList<View> items = new ArrayList<>(getItemsInReadingOrder());
         items.add(rank, view);
         mContent.arrangeChildren(items, items.size());