summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/shortcuts
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-09-23 23:23:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-23 23:23:03 +0000
commitc2f72b0bb89dbde5102b3a660e51e789ebaeb005 (patch)
treee898b6fca52a0e289d65d04b58d5600209b19d0e /src/com/android/launcher3/shortcuts
parenta18d50fd3b6aae07396806d5921886cc9783a608 (diff)
parent6ad72f02fd233f2294222477102e83d721100493 (diff)
downloadandroid_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.java2
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,