commit 310a9889937677091868ae7759c90d033ca08bb6
author Peter Schiller <peterschiller@google.com> Thu Jun 30 13:52:36 2016 -0700
committer Peter Schiller <peterschiller@google.com> Thu Jun 30 18:09:51 2016 -0700
tree dc8a6dd6a00c96ec5f8973566d7bb0c9dfed85f7
parent b1e9e8d662d3e6c945c817d09270c799b62b4af3

Updating all apps to match spec

Change-Id: Ie351fdea2e3b05ca911e6533f0c5d00c17e0847c

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 84c29dc..a31c8ae 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1370,7 +1370,9 @@
         mDragController.addDropTarget(mWorkspace);
         mDropTargetBar.setup(mDragController);
 
-        mAllAppsController.setupViews(mAppsView, mHotseat, mWorkspace);
+        if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) {
+            mAllAppsController.setupViews(mAppsView, mHotseat, mWorkspace);
+        }
 
         if (TestingUtils.MEMORY_DUMP_ENABLED) {
             TestingUtils.addWeightWatcher(this);