summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/dragndrop
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2017-06-23 14:57:38 -0700
committerHyunyoung Song <hyunyoungs@google.com>2017-06-26 11:25:01 -0700
commit1322f9cb9a8715d463094e13079af7e6e689429a (patch)
tree2e9a1809d3f3be291de492e46c98387c2b331b19 /src/com/android/launcher3/dragndrop
parent48f1135a6dbdee99ff1e981682e99d8755944062 (diff)
downloadandroid_packages_apps_Trebuchet-1322f9cb9a8715d463094e13079af7e6e689429a.tar.gz
android_packages_apps_Trebuchet-1322f9cb9a8715d463094e13079af7e6e689429a.tar.bz2
android_packages_apps_Trebuchet-1322f9cb9a8715d463094e13079af7e6e689429a.zip
Fixing drag outline not getting drawn when the shortcuts popup is shown.
Shortucts popup uses predrag listener to manage the transient state of the icon. Fixing the order of PredragListener, such that predragEnd gets called before dragStart. This allows the transient state to be cleared before any other state changes are done by onDragStart. Bug: 62544416 Change-Id: I77c9a1aa17a15fe6f9f342af7a7fe3092a9d026b
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
-rw-r--r--src/com/android/launcher3/dragndrop/DragController.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 50ad0ff8a..b8527148b 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -210,13 +210,13 @@ public class DragController implements DragDriver.EventListener, TouchController
}
private void callOnDragStart() {
- for (DragListener listener : new ArrayList<>(mListeners)) {
- listener.onDragStart(mDragObject, mOptions);
- }
if (mOptions.preDragCondition != null) {
mOptions.preDragCondition.onPreDragEnd(mDragObject, true /* dragStarted*/);
}
mIsInPreDrag = false;
+ for (DragListener listener : new ArrayList<>(mListeners)) {
+ listener.onDragStart(mDragObject, mOptions);
+ }
}
/**