summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/dragndrop
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2016-06-06 21:04:36 -0700
committerHyunyoung Song <hyunyoungs@google.com>2016-06-06 21:04:36 -0700
commitb11ae50fcb2bb07ee77645fdacdf90f67f58dae4 (patch)
tree6c46b903501dde210b1d6f61f71602673f54fae2 /src/com/android/launcher3/dragndrop
parent645764e3e5fa34d9adcddfc722d726b76f048306 (diff)
downloadandroid_packages_apps_Trebuchet-b11ae50fcb2bb07ee77645fdacdf90f67f58dae4.tar.gz
android_packages_apps_Trebuchet-b11ae50fcb2bb07ee77645fdacdf90f67f58dae4.tar.bz2
android_packages_apps_Trebuchet-b11ae50fcb2bb07ee77645fdacdf90f67f58dae4.zip
Guard all apps pull up work behind the flag
b/28917826 Change-Id: Ic001d820bad777d90c6bdcd1a17b6961e38769be
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
-rw-r--r--src/com/android/launcher3/dragndrop/DragLayer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index e4c84360c..318c67de8 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -274,7 +274,7 @@ public class DragLayer extends InsettableFrameLayout {
mActiveController = mDragController;
return true;
}
- if (mAllAppsController.onInterceptTouchEvent(ev)) {
+ if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && mAllAppsController.onInterceptTouchEvent(ev)) {
mActiveController = mAllAppsController;
return true;
}