commit 1bcb36dacf368a93613f308bc9e80a346ed7534f
author Jon Miranda <jonmiranda@google.com> Tue May 23 21:31:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 23 21:31:31 2017 +0000
tree b828776e294713c781b9b8e0efc068f5af90b222
parent 50e6d12fb55e91141bdee48db0745eeaea293476
parent 4e54a4cfa50838ea0a970fea2632851bcb16e2c0

Fix bug where item was not moved in database when added to a Folder.
am: 4e54a4cfa5

Change-Id: I861abced20e4feb0d222997249c774e324124cef

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());