diff options
| author | Winson Chung <winsonc@google.com> | 2015-05-05 00:36:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 00:36:02 +0000 |
| commit | 2a53cb7a5e86920fdc9063ddf3966af5d5472c56 (patch) | |
| tree | 22e3217ab7769b9175e76d4e3be575ed4a39253b /src/com/android/launcher3/LauncherStateTransitionAnimation.java | |
| parent | 80068f518c858babf75cb6f5bf076875dc0cc481 (diff) | |
| parent | cd99cd3ed6a84b9dcd8f4c60b0941760f85a64ce (diff) | |
| download | android_packages_apps_Trebuchet-2a53cb7a5e86920fdc9063ddf3966af5d5472c56.tar.gz android_packages_apps_Trebuchet-2a53cb7a5e86920fdc9063ddf3966af5d5472c56.tar.bz2 android_packages_apps_Trebuchet-2a53cb7a5e86920fdc9063ddf3966af5d5472c56.zip | |
Merge "Launcher-side changes to support prediction bar." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/LauncherStateTransitionAnimation.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index 9e005f29a..51f84bfcd 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -249,8 +249,8 @@ public class LauncherStateTransitionAnimation { // Create the workspace animation. // NOTE: this call apparently also sets the state for the workspace if !animated - Animator workspaceAnim = mLauncher.getWorkspace().setStateWithAnimation( - toWorkspaceState, -1, animated, layerViews); + Animator workspaceAnim = mLauncher.startWorkspaceStateChangeAnimation(toWorkspaceState, -1, + animated, layerViews); if (animated && initialized) { mStateAnimation = LauncherAnimUtils.createAnimatorSet(); @@ -546,8 +546,8 @@ public class LauncherStateTransitionAnimation { // Create the workspace animation. // NOTE: this call apparently also sets the state for the workspace if !animated - Animator workspaceAnim = mLauncher.getWorkspace().setStateWithAnimation( - toWorkspaceState, toWorkspacePage, animated, layerViews); + Animator workspaceAnim = mLauncher.startWorkspaceStateChangeAnimation(toWorkspaceState, + toWorkspacePage, animated, layerViews); if (animated && initialized) { mStateAnimation = LauncherAnimUtils.createAnimatorSet(); |