diff options
author | Tony <twickham@google.com> | 2018-04-27 12:33:24 -0500 |
---|---|---|
committer | Tony <twickham@google.com> | 2018-05-01 13:45:27 -0500 |
commit | 31fbd4c08ba9257ea2f85732c4d00b127d65875c (patch) | |
tree | 6ddf8621e78f8fb5e77e8372812d879f380c84fd /src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | |
parent | 3aa3eb51e2403a5f18ba1b16c574127405252a07 (diff) | |
download | android_packages_apps_Trebuchet-31fbd4c08ba9257ea2f85732c4d00b127d65875c.tar.gz android_packages_apps_Trebuchet-31fbd4c08ba9257ea2f85732c4d00b127d65875c.tar.bz2 android_packages_apps_Trebuchet-31fbd4c08ba9257ea2f85732c4d00b127d65875c.zip |
Fix some state issues with user-controlled animations
Previously, user-controlled animations weren't properly being canceled when a
non-user-controlled animation started, e.g. when hitting home. Thus, we could
end in the wrong or inconsistent state because the user-controlled animation's
end runnable was still used. Now we add a cleanup callback for when we reset
the user-controlled animation for one that isn't user-controlled.
Also fixed a couple typos.
Tests (easier with animation durations extended):
- Swipe up and hit home before reaching overview -> land on home
- Go to overview, swipe down slightly (before threshold to go to workspace)
and let go -> return to overview without flash (recents was resetting)
- Swipe up, press home while swiping -> goes home, stops responding to drag
- Start dismissing task and hit home before it finishes (or while dragging)
-> goes home, stops responding to drag
Bug: 78249220
Change-Id: If11d8999e3fadba38c987b25af67cd2304cd859b
Diffstat (limited to 'src/com/android/launcher3/WorkspaceStateTransitionAnimation.java')
-rw-r--r-- | src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 420a7c418..77a45bfc0 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -53,7 +53,7 @@ public class WorkspaceStateTransitionAnimation { public void setStateWithAnimation(LauncherState toState, AnimatorSetBuilder builder, AnimationConfig config) { - setWorkspaceProperty(toState, config.getProperSetter(builder)); + setWorkspaceProperty(toState, config.getPropertySetter(builder)); } public float getFinalScale() { |