From b11ae50fcb2bb07ee77645fdacdf90f67f58dae4 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 6 Jun 2016 21:04:36 -0700
Subject: [PATCH] Guard all apps pull up work behind the flag

b/28917826

Change-Id: Ic001d820bad777d90c6bdcd1a17b6961e38769be
---
 .../android/launcher3/LauncherStateTransitionAnimation.java   | 4 +++-
 src/com/android/launcher3/dragndrop/DragLayer.java            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
index 41e30b1290..4563bf883d 100644
--- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java
+++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
@@ -683,7 +683,9 @@ public class LauncherStateTransitionAnimation {
                     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 e4c84360c1..318c67de88 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;
         }