commit | c00a6da6ea2ed16e25afcca1227ff990de2ea130 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu Jun 14 18:06:20 2018 +0000 |
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu Jun 14 18:06:20 2018 +0000 |
tree | f98018647d19209bef494cdaa8c234808fba4149 | |
parent | 3ebddba5a0e8210bf794fa40c01cf6f86b5eea72 [diff] | |
parent | f8fafa2847e20986d9f96baab3be4a0005845994 [diff] |
[automerger] Immediate 2nd quickscrub should not cancel if same state am: f8fafa2847 Change-Id: I08f16d8028cfbd74c376000ca5edfc7802b96f48
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);