commit 0c29decbfdf0da941251fdb2e61279abe4ae6737
author Tony Wickham <twickham@google.com> Thu Sep 17 19:54:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 17 19:54:10 2015 +0000
tree f62ca4af85ffab6d16862a9511942df492bab471
parent f519a039b293a23dcc1bf6f9352fe62ada1106f2
parent 1cdb6d066123cb9b2f9ea2c66246b29bf1dd9cf2

am 1cdb6d06: onDropChild() always marks the cell as occupied.

* commit '1cdb6d066123cb9b2f9ea2c66246b29bf1dd9cf2':
  onDropChild() always marks the cell as occupied.

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 700bf9e..b8b4144 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -2685,6 +2685,7 @@
             LayoutParams lp = (LayoutParams) child.getLayoutParams();
             lp.dropped = true;
             child.requestLayout();
+            markCellsAsOccupiedForView(child);
         }
     }