commit 74f5ed3538c3cc224db41a2ea08f0acd4663f616
author Hyunyoung Song <hyunyoungs@google.com> Tue Jun 28 23:53:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 28 23:53:06 2016 +0000
tree 36dfb902d585f44f4d7e289923be49401cbfcdd2
parent 3ed5ef78db9db75cb395827c1f117cb92a824cf2
parent 26def23702881867208bfc465af27a4f9afc26f6

Merge \"All apps icons should become clickable\" into ub-launcher3-calgary
am: 26def23702

Change-Id: I8d0277113b7349766fde8c739bcb708b79db9570

src/com/android/launcher3/allapps/AllAppsTransitionController.java

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 4e4e87c..4c51dfe 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -258,8 +258,6 @@
                 mAppsView.getRevealView().setAlpha(mHotseatBackgroundAlpha);
                 setProgress(mShiftRange);
             } else {
-                // TODO: get rid of this workaround to override state change by workspace transition
-                mWorkspace.onLauncherTransitionPrepare(mLauncher, false, false);
                 View child = ((CellLayout) mWorkspace.getChildAt(mWorkspace.getNextPage()))
                         .getShortcutsAndWidgets();
                 child.setVisibility(View.VISIBLE);
@@ -429,9 +427,6 @@
     }
 
     public void finishPullDown() {
-        if (mHotseat.getBackground() != null) {
-            return;
-        }
         mAppsView.setVisibility(View.INVISIBLE);
         mHotseat.setBackgroundTransparent(false /* transparent */);
         mHotseat.setVisibility(View.VISIBLE);