diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-31 18:07:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-31 18:07:44 +0000 |
| commit | e5f7acf74a89d4d3fc9d76380268d89fc6d0ee7e (patch) | |
| tree | a0c6c302e70cce1166aae7e4d9a7e37d55e70494 /src | |
| parent | 899c08aee8dba224ac12b5dce27ec1635f4ad07e (diff) | |
| parent | 402cf4c0cf973ef83cf76fbdef77e272631a77a8 (diff) | |
| download | android_packages_apps_Trebuchet-e5f7acf74a89d4d3fc9d76380268d89fc6d0ee7e.tar.gz android_packages_apps_Trebuchet-e5f7acf74a89d4d3fc9d76380268d89fc6d0ee7e.tar.bz2 android_packages_apps_Trebuchet-e5f7acf74a89d4d3fc9d76380268d89fc6d0ee7e.zip | |
Merge "Stop DiscoveryBounce when user drags to home from Hotseat in Overview." into ub-launcher3-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragController.java | 3 |
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) { |