commit f37cfa72d223214e3204272ccfbd62da664a0a42
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 15 19:36:41 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 15 19:36:41 2018 +0000
tree 3dca79a0baf8495ef5fa8a4445f5cd16cfa7b5e0
parent ae7c6d12840264bad5d31933f743677a73c3f8fb
parent f8fafa2847e20986d9f96baab3be4a0005845994

Merge "Immediate 2nd quickscrub should not cancel if same state" into ub-launcher3-edmonton-polish

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);