commit 9dcf0a3ef7595f58aedec7773e7bc3b9075fb3ca
author Hyunyoung Song <hyunyoungs@google.com> Wed Jul 27 10:55:51 2016 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Wed Jul 27 10:55:51 2016 -0700
tree 1090de98d9913bcca8c7eae3eeeb7d41873f93f2
parent 10717bfcae5fc6d34818f09d4f2ce584222cdba0

AllAppsTransitionController always use LauncherStateTransitionAnimation
b/30375760

Change-Id: Iee2f8060e4d272d276ddd5d40b4bc6053e8c7778

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f8b7c74..deac73b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3296,7 +3296,7 @@
     public boolean showWorkspace(boolean animated, Runnable onCompleteRunnable) {
         boolean changed = mState != State.WORKSPACE ||
                 mWorkspace.getState() != Workspace.State.NORMAL;
-        if (changed) {
+        if (changed || mAllAppsController.isTransitioning()) {
             mWorkspace.setVisibility(View.VISIBLE);
             mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
                     Workspace.State.NORMAL, animated, onCompleteRunnable);
@@ -3393,8 +3393,10 @@
     // TODO: calling method should use the return value so that when {@code false} is returned
     // the workspace transition doesn't fall into invalid state.
     private boolean showAppsOrWidgets(State toState, boolean animated, boolean focusSearchBar) {
-        if (mState != State.WORKSPACE &&  mState != State.APPS_SPRING_LOADED &&
-                mState != State.WIDGETS_SPRING_LOADED) {
+        if (!(mState == State.WORKSPACE ||
+                mState == State.APPS_SPRING_LOADED ||
+                mState == State.WIDGETS_SPRING_LOADED ||
+                (mState == State.APPS && mAllAppsController.isTransitioning()))) {
             return false;
         }
         if (toState != State.APPS && toState != State.WIDGETS) {