summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-06-15 19:36:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-06-15 19:36:41 +0000
commitf37cfa72d223214e3204272ccfbd62da664a0a42 (patch)
tree3dca79a0baf8495ef5fa8a4445f5cd16cfa7b5e0 /src
parentae7c6d12840264bad5d31933f743677a73c3f8fb (diff)
parentf8fafa2847e20986d9f96baab3be4a0005845994 (diff)
downloadandroid_packages_apps_Trebuchet-f37cfa72d223214e3204272ccfbd62da664a0a42.tar.gz
android_packages_apps_Trebuchet-f37cfa72d223214e3204272ccfbd62da664a0a42.tar.bz2
android_packages_apps_Trebuchet-f37cfa72d223214e3204272ccfbd62da664a0a42.zip
Merge "Immediate 2nd quickscrub should not cancel if same state" into ub-launcher3-edmonton-polish
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/LauncherStateManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 8b415d68c..3c7c1aa07 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -382,7 +382,9 @@ public class LauncherStateManager {
}
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);