aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Do not reset the previous state animation, if it is a part of the new state animaiton" into ub-launcher3-master

Browse Source
This commit is contained in:
Sunny Goyal
2018-04-10 03:02:02 +00:00
committed by Android (Google) Code Review
parent 97b658f289 b35f50cf55
commit 82d2074cd2
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
View File

@@ -206,6 +206,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
return false;
}
Animator childStateAnimation = null;
// Found a visible recents task that matches the opening app, lets launch the app from there
Animator launcherAnim;
final AnimatorListenerAdapter windowAnimEndListener;
@@ -221,6 +222,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
mLauncher.getStateManager()
.createAnimationToNewWorkspace(NORMAL, RECENTS_LAUNCH_DURATION);
controller.dispatchOnStart();
childStateAnimation = controller.getOriginalTarget();
launcherAnim = controller.getAnimationPlayer().setDuration(RECENTS_LAUNCH_DURATION);
windowAnimEndListener = new AnimatorListenerAdapter() {
@Override
@@ -237,7 +239,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
// Set the current animation first, before adding windowAnimEndListener. Setting current
// animation adds some listeners which need to be called before windowAnimEndListener
// (the ordering of listeners matter in this case).
mLauncher.getStateManager().setCurrentAnimation(target);
mLauncher.getStateManager().setCurrentAnimation(target, childStateAnimation);
target.addListener(windowAnimEndListener);
return true;
}