summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/dragndrop
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-03-20 17:12:24 -0700
committerTony Wickham <twickham@google.com>2017-03-30 15:48:53 -0700
commit50e5165b78c75ccb022f0954699f49c579547115 (patch)
tree754a3dfe45fbed74cb3b122312304cf406226ebf /src/com/android/launcher3/dragndrop
parent8eb0de133154666cd20d0244953ee755b626b44a (diff)
downloadandroid_packages_apps_Trebuchet-50e5165b78c75ccb022f0954699f49c579547115.tar.gz
android_packages_apps_Trebuchet-50e5165b78c75ccb022f0954699f49c579547115.tar.bz2
android_packages_apps_Trebuchet-50e5165b78c75ccb022f0954699f49c579547115.zip
Add WidgetsAndMore bottom sheet
- Contains two rows, one for widgets, and one for "configurable shortcuts" that have customization activities - Extends AbstractFloatingView and uses VerticalPullDetector for touch interactions - No way to show this currently; will add options to popup in followup Bug: 34940468 Change-Id: Iab62c2cb89428f91119c9c86f9db886496c321fd
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
-rw-r--r--src/com/android/launcher3/dragndrop/DragLayer.java7
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;