aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Prevent blinking when user presses home." into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-08 03:48:56 +00:00
committed by Android (Google) Code Review
parent ce29861598 0d5daafd2f
commit 7780fa7bc7
5 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
private View mFloatingView;
private boolean mIsRtl;
private Animator mCurrentAnimator;
private LauncherTransitionAnimator mCurrentAnimator;
public LauncherAppTransitionManagerImpl(Context context) {
mLauncher = Launcher.getLauncher(context);
@@ -109,7 +109,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
mDeviceProfile = dp;
}
private void setCurrentAnimator(Animator animator) {
private void setCurrentAnimator(LauncherTransitionAnimator animator) {
if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
mCurrentAnimator.cancel();
}
@@ -117,9 +117,9 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
}
@Override
public void finishAnimation() {
public void finishLauncherAnimation() {
if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
mCurrentAnimator.end();
mCurrentAnimator.finishLauncherAnimation();
}
mCurrentAnimator = null;
}
@@ -139,10 +139,10 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
// Post at front of queue ignoring sync barriers to make sure it gets
// processed before the next frame.
postAtFrontOfQueueAsynchronously(v.getHandler(), () -> {
mAnimator = new AnimatorSet();
setCurrentAnimator(mAnimator);
mAnimator.play(getLauncherAnimators(v));
mAnimator.play(getWindowAnimators(v, targets));
LauncherTransitionAnimator animator = new LauncherTransitionAnimator(
getLauncherAnimators(v), getWindowAnimators(v, targets));
setCurrentAnimator(animator);
mAnimator = animator.getAnimatorSet();
mAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
@@ -449,16 +449,16 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
return;
}
mAnimator = new AnimatorSet();
setCurrentAnimator(mAnimator);
LauncherTransitionAnimator animator = new LauncherTransitionAnimator(
getLauncherResumeAnimation(), getClosingWindowAnimators(targets));
setCurrentAnimator(animator);
mAnimator = animator.getAnimatorSet();
mAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
finishedCallback.run();
}
});
mAnimator.play(getClosingWindowAnimators(targets));
mAnimator.play(getLauncherResumeAnimation());
mAnimator.start();
// Because t=0 has the app icon in its original spot, we can skip the