diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-09-23 23:23:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-23 23:23:03 +0000 |
commit | c2f72b0bb89dbde5102b3a660e51e789ebaeb005 (patch) | |
tree | e898b6fca52a0e289d65d04b58d5600209b19d0e /src/com/android/launcher3/shortcuts | |
parent | a18d50fd3b6aae07396806d5921886cc9783a608 (diff) | |
parent | 6ad72f02fd233f2294222477102e83d721100493 (diff) | |
download | android_packages_apps_Trebuchet-c2f72b0bb89dbde5102b3a660e51e789ebaeb005.tar.gz android_packages_apps_Trebuchet-c2f72b0bb89dbde5102b3a660e51e789ebaeb005.tar.bz2 android_packages_apps_Trebuchet-c2f72b0bb89dbde5102b3a660e51e789ebaeb005.zip |
Merge "Resize only one widget at a time" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/shortcuts')
-rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java index df393d3b6..d825cb894 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java @@ -458,7 +458,7 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC cleanupDeferredDrag(true); mDeferredDragIcon.getParent().requestDisallowInterceptTouchEvent(false); mDeferredDragIcon.getOnLongClickListener().onLongClick(mDeferredDragIcon); - mLauncher.getDragController().onTouchEvent(ev); + mLauncher.getDragController().onControllerTouchEvent(ev); return true; } else if (mDistanceDragged > mDragDeadzone) { // After dragging further than a small deadzone, |