diff options
| author | Tony Wickham <twickham@google.com> | 2017-03-30 23:21:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-30 23:21:39 +0000 |
| commit | d73fbb5f975ceedaec6463164ee39b3f32623151 (patch) | |
| tree | 5121dbc975d032cef4543b176d24f66dd1c39569 /src/com/android/launcher3/dragndrop | |
| parent | 6634869bad0eb36b34a52569cbfbe78e1ef3f9be (diff) | |
| parent | 50e5165b78c75ccb022f0954699f49c579547115 (diff) | |
| download | android_packages_apps_Trebuchet-d73fbb5f975ceedaec6463164ee39b3f32623151.tar.gz android_packages_apps_Trebuchet-d73fbb5f975ceedaec6463164ee39b3f32623151.tar.bz2 android_packages_apps_Trebuchet-d73fbb5f975ceedaec6463164ee39b3f32623151.zip | |
Merge "Add WidgetsAndMore bottom sheet" into ub-launcher3-dorval
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 23a257767..b04d5b747 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -61,6 +61,7 @@ import com.android.launcher3.logging.LoggerUtils; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.TouchController; +import com.android.launcher3.widget.WidgetsAndMore; import java.util.ArrayList; @@ -246,6 +247,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; |