diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-07-12 14:59:09 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-07-12 15:15:00 -0700 |
commit | 379e8e0fa227a9b0327126b0b68302ee3458b694 (patch) | |
tree | ad05ab378b946d93f10c2e9e953ccfa019adb157 /src | |
parent | 32f91ab991dd2a1c6c0054c86b8700f2b966fd36 (diff) | |
download | android_packages_apps_Trebuchet-379e8e0fa227a9b0327126b0b68302ee3458b694.tar.gz android_packages_apps_Trebuchet-379e8e0fa227a9b0327126b0b68302ee3458b694.tar.bz2 android_packages_apps_Trebuchet-379e8e0fa227a9b0327126b0b68302ee3458b694.zip |
Preventing state change duing the swipe up animation when the previous app
transition is not complete
> This state change causes the RecentsView to get reset making the first
task visible
Bug: 111404703
Change-Id: I8ff2577bf965fb4cdf736fb18683ded63ade1872
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/LauncherStateManager.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index 3c7c1aa07..5bbfc1d79 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -306,7 +306,13 @@ public class LauncherStateManager { */ public AnimatorPlaybackController createAnimationToNewWorkspace( LauncherState fromState, LauncherState state, long duration) { + // Since we are creating a state animation to a different state, temporarily prevent state + // change as part of config reset. + LauncherState originalRestState = mRestState; + mRestState = state; mConfig.reset(); + mRestState = originalRestState; + for (StateHandler handler : getStateHandlers()) { handler.setState(fromState); } |