commit 81fbb53ee3b99feb26975fb4c7606633f2b74e34
author Jonathan Miranda <jonmiranda@google.com> Fri Jun 15 19:44:12 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 15 19:44:12 2018 +0000
tree a72d05c32a97af336e5fd44a1c95f480da5de148
parent 6e94ee24ce956d004eac375067e163175e28df12
parent 1f21f417f416307bafdd47a3094b962e88b7760b

Merge changes from topic "am-e8c5d80c-f67d-44fc-85c2-887442665503" into ub-launcher3-master

* changes:
  [automerger] Fix bug where QSB gets clipped when flinging All Apps open. am: 3c71c6a564
  Fix bug where QSB gets clipped when flinging All Apps open.

src/com/android/launcher3/LauncherStateManager.java

diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 8b415d6..3c7c1aa 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -382,7 +382,9 @@
     }
 
     private void onStateTransitionStart(LauncherState state) {
-        mState.onStateDisabled(mLauncher);
+        if (mState != state) {
+            mState.onStateDisabled(mLauncher);
+        }
         mState = state;
         mState.onStateEnabled(mLauncher);
         mLauncher.getAppWidgetHost().setResumed(state == LauncherState.NORMAL);