commit 6e94ee24ce956d004eac375067e163175e28df12
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 840100ff899eb3404409cd794f20eef9c5d64e16
parent 1cffc1a5ef0d678457225139daaf3e089c902c21
parent c00a6da6ea2ed16e25afcca1227ff990de2ea130

Merge changes from topic "am-c5545bb3-b4fc-4188-890e-09975d70878c" into ub-launcher3-master

* changes:
  [automerger] Immediate 2nd quickscrub should not cancel if same state am: f8fafa2847
  Immediate 2nd quickscrub should not cancel if same state

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