diff options
| author | Tony Wickham <twickham@google.com> | 2017-03-30 23:26:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-30 23:26:12 +0000 |
| commit | 52f0130a76addcfec25775004c24346dc69b30d3 (patch) | |
| tree | 480a0ea0971ea74f46227625507693aceb06a943 /src/com/android/launcher3/dragndrop | |
| parent | 65caaf60cec88db83e2c2626a9fd8cce12842928 (diff) | |
| parent | d73fbb5f975ceedaec6463164ee39b3f32623151 (diff) | |
| download | android_packages_apps_Trebuchet-52f0130a76addcfec25775004c24346dc69b30d3.tar.gz android_packages_apps_Trebuchet-52f0130a76addcfec25775004c24346dc69b30d3.tar.bz2 android_packages_apps_Trebuchet-52f0130a76addcfec25775004c24346dc69b30d3.zip | |
Merge "Add WidgetsAndMore bottom sheet" into ub-launcher3-dorval
am: d73fbb5f97
Change-Id: I5d1bad3ea83e672076dbd3b6f2d80d5149f3921c
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index e1a983486..705262e5b 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -60,6 +60,7 @@ import com.android.launcher3.keyboard.ViewGroupFocusHelper; import com.android.launcher3.logging.LoggerUtils; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.TouchController; +import com.android.launcher3.widget.WidgetsAndMore; import java.util.ArrayList; @@ -245,6 +246,12 @@ public class DragLayer extends InsettableFrameLayout { return true; } + WidgetsAndMore widgetsAndMore = WidgetsAndMore.getOpen(mLauncher); + if (widgetsAndMore != null && widgetsAndMore.onControllerInterceptTouchEvent(ev)) { + mActiveController = widgetsAndMore; + return true; + } + if (mPinchListener != null && mPinchListener.onControllerInterceptTouchEvent(ev)) { // Stop listening for scrolling etc. (onTouchEvent() handles the rest of the pinch.) mActiveController = mPinchListener; |