Merge "Guard all apps pull up work behind the flag" into ub-launcher3-calgary
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
index 41e30b1..4563bf8 100644
--- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java
+++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
@@ -683,7 +683,9 @@
animated, initialized, animation, revealDuration, layerViews);
}
if (!animated || !initialized) {
- mAllAppsController.finishPullDown();
+ if (!FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) {
+ mAllAppsController.finishPullDown();
+ }
fromView.setVisibility(View.GONE);
dispatchOnLauncherTransitionPrepare(fromView, animated, multiplePagesVisible);
dispatchOnLauncherTransitionStart(fromView, animated, true);
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index e4c8436..318c67d 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -274,7 +274,7 @@
mActiveController = mDragController;
return true;
}
- if (mAllAppsController.onInterceptTouchEvent(ev)) {
+ if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && mAllAppsController.onInterceptTouchEvent(ev)) {
mActiveController = mAllAppsController;
return true;
}