summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTracy Zhou <tracyzhou@google.com>2018-07-23 11:41:57 -0700
committerTracy Zhou <tracyzhou@google.com>2018-07-23 11:41:57 -0700
commit402cf4c0cf973ef83cf76fbdef77e272631a77a8 (patch)
tree943413f3872f1464bac651dc5cdfbae7197962d7 /src
parent82c114ca9ca212e8257d34860b42f4a021a63213 (diff)
downloadandroid_packages_apps_Trebuchet-402cf4c0cf973ef83cf76fbdef77e272631a77a8.tar.gz
android_packages_apps_Trebuchet-402cf4c0cf973ef83cf76fbdef77e272631a77a8.tar.bz2
android_packages_apps_Trebuchet-402cf4c0cf973ef83cf76fbdef77e272631a77a8.zip
Stop DiscoveryBounce when user drags to home from Hotseat in Overview.
Change-Id: I9f1ba2eef149565e6aab314a4a8376c1cb08cb60 Fixes: 111330609 Test: Manual test
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/dragndrop/DragController.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 8a216fc17..47bbbcb0d 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -16,6 +16,7 @@
package com.android.launcher3.dragndrop;
+import static com.android.launcher3.AbstractFloatingView.TYPE_DISCOVERY_BOUNCE;
import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
import static com.android.launcher3.LauncherState.NORMAL;
@@ -31,6 +32,7 @@ import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
+import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.DragSource;
import com.android.launcher3.DropTarget;
import com.android.launcher3.ItemInfo;
@@ -145,6 +147,7 @@ public class DragController implements DragDriver.EventListener, TouchController
// Hide soft keyboard, if visible
UiThreadHelper.hideKeyboardAsync(mLauncher, mWindowToken);
+ AbstractFloatingView.closeOpenViews(mLauncher, false, TYPE_DISCOVERY_BOUNCE);
mOptions = options;
if (mOptions.systemDndStartPoint != null) {