diff options
| author | Matthew Ng <ngmatthew@google.com> | 2018-06-13 16:36:29 -0700 |
|---|---|---|
| committer | Matthew Ng <ngmatthew@google.com> | 2018-06-14 11:05:44 -0700 |
| commit | f8fafa2847e20986d9f96baab3be4a0005845994 (patch) | |
| tree | 188845531fa6b6adb47745a81aa3c9e9555d3699 /src | |
| parent | 4f8e417bca27c570e613dd088998216a14d8a3f3 (diff) | |
| download | android_packages_apps_Trebuchet-f8fafa2847e20986d9f96baab3be4a0005845994.tar.gz android_packages_apps_Trebuchet-f8fafa2847e20986d9f96baab3be4a0005845994.tar.bz2 android_packages_apps_Trebuchet-f8fafa2847e20986d9f96baab3be4a0005845994.zip | |
Immediate 2nd quickscrub should not cancel if same state
Trigging quickscrub immediately after a previous quickscrub would cause
the controller to cancel even if the state change was from overview to
overview, then controller will not do auto-advancing because it thinks
quickscrub has been cancelled. If the state changes but both are
overview then do not cancel and quickscrub can do auto-advancing.
Change-Id: I309937572ad23eea14662501f41c13cd79dd10ab
Fixes: 110006796
Test: quickscrub, then let go and soon after quickscrub again
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateManager.java | 4 |
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); |