summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/CellLayout.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-10-18 14:43:01 -0700
committerTony Wickham <twickham@google.com>2016-10-18 14:46:02 -0700
commit4e47b5b0d678f9b23bee211a7808c73c51a1d7d1 (patch)
tree7d8f06abcfffbbb8e5793cb186e6551b74a404a0 /src/com/android/launcher3/CellLayout.java
parent3f0a53fa448fc077a1e3ca547bdd0f3bd408372f (diff)
downloadpackages_apps_Trebuchet-4e47b5b0d678f9b23bee211a7808c73c51a1d7d1.tar.gz
packages_apps_Trebuchet-4e47b5b0d678f9b23bee211a7808c73c51a1d7d1.tar.bz2
packages_apps_Trebuchet-4e47b5b0d678f9b23bee211a7808c73c51a1d7d1.zip
Mark cells as unoccupied in onDragStart instead of startDrag.
Also move cleanup (resetting variables to null) to onDragEnd instead of onDropCompleted. These changes are necessary because pre-drags (for apps with shortcuts) don't call onDragStart or onDropCompleted. Bug: 32246571 Change-Id: Ib18fac64555e9158b776f9c12afc2cb807b3c355
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r--src/com/android/launcher3/CellLayout.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 5d3cbb299..191135d7d 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -2215,10 +2215,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
return solution;
}
- public void prepareChildForDrag(View child) {
- markCellsAsUnoccupiedForView(child);
- }
-
/* This seems like it should be obvious and straight-forward, but when the direction vector
needs to match with the notion of the dragView pushing other views, we have to employ
a slightly more subtle notion of the direction vector. The question is what two points is