diff options
author | Jon Miranda <jonmiranda@google.com> | 2019-05-28 13:03:02 -0700 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2019-05-29 14:32:49 -0700 |
commit | c69d1ffd923e37166cc3dadf8938dc8a8b38e0c7 (patch) | |
tree | d8d7f5eaea888d66b6980e754aeda4f7a9f67f92 /quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java | |
parent | 666b60a07485f0c70884df641c1166a8386d1fd6 (diff) | |
download | android_packages_apps_Trebuchet-c69d1ffd923e37166cc3dadf8938dc8a8b38e0c7.tar.gz android_packages_apps_Trebuchet-c69d1ffd923e37166cc3dadf8938dc8a8b38e0c7.tar.bz2 android_packages_apps_Trebuchet-c69d1ffd923e37166cc3dadf8938dc8a8b38e0c7.zip |
Add staggered springs animation when swiping up to home.
Bug: 123900446
Change-Id: I275e34c6dca5b026f272ab216b18651c0df27bc4
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java index 00e4a9d5a..5af09f7fd 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java @@ -57,6 +57,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.views.FloatingIconView; import com.android.quickstep.SysUINavigationMode.Mode; import com.android.quickstep.util.LayoutUtils; +import com.android.quickstep.util.StaggeredWorkspaceAnim; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; import com.android.systemui.shared.system.RemoteAnimationTargetCompat; @@ -151,8 +152,21 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe @NonNull @Override public AnimatorPlaybackController createActivityAnimationToHome() { + // Return an empty APC here since we have an non-user controlled animation to home. long accuracy = 2 * Math.max(dp.widthPx, dp.heightPx); - return activity.getStateManager().createAnimationToNewWorkspace(NORMAL, accuracy); + AnimatorSet as = new AnimatorSet(); + as.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + activity.getStateManager().goToState(NORMAL, false); + } + }); + return AnimatorPlaybackController.wrap(as, accuracy); + } + + @Override + public void playAtomicAnimation(float velocity) { + new StaggeredWorkspaceAnim(activity, workspaceView, velocity).start(); } }; } |