PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix taskbar unstash animation delay when launching a split task." into tm-qpr-dev

Browse Source
This commit is contained in:
Schneider Victor-tulias
2022-06-21 19:38:46 +00:00
committed by Android (Google) Code Review
parent 61c6b580ad e164995f9e
commit 6c71fe71bd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+3 -4
View File
@@ -183,10 +183,8 @@ import java.util.function.Supplier;
mTaskBarRecentsAnimationListener = new TaskBarRecentsAnimationListener(callbacks);
callbacks.addListener(mTaskBarRecentsAnimationListener);
RecentsView recentsView = mLauncher.getOverviewPanel();
recentsView.setTaskLaunchListener(() -> {
mTaskBarRecentsAnimationListener.endGestureStateOverride(true);
});
((RecentsView) mLauncher.getOverviewPanel()).setTaskLaunchListener(() ->
mTaskBarRecentsAnimationListener.endGestureStateOverride(true));
return animatorSet;
}
@@ -491,6 +489,7 @@ import java.util.function.Supplier;
private void endGestureStateOverride(boolean finishedToApp) {
mCallbacks.removeListener(this);
mTaskBarRecentsAnimationListener = null;
((RecentsView) mLauncher.getOverviewPanel()).setTaskLaunchListener(null);
// Update the resumed state immediately to ensure a seamless handoff
boolean launcherResumed = !finishedToApp;
quickstep/src/com/android/quickstep/TaskViewUtils.java
+6 -5
View File
@@ -468,7 +468,6 @@ public final class TaskViewUtils {
animatorSet.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
finishCallback.run();
}
});
@@ -530,7 +529,6 @@ public final class TaskViewUtils {
for (SurfaceControl leash: closingTargets) {
t.hide(leash);
}
super.onAnimationEnd(animation);
finishCallback.run();
}
});
@@ -599,8 +597,13 @@ public final class TaskViewUtils {
launcherAnim.setInterpolator(Interpolators.TOUCH_RESPONSE_INTERPOLATOR);
launcherAnim.setDuration(RECENTS_LAUNCH_DURATION);
// Make sure recents gets fixed up by resetting task alphas and scales, etc.
windowAnimEndListener = new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
recentsView.onTaskLaunchedInLiveTileMode();
}
// Make sure recents gets fixed up by resetting task alphas and scales, etc.
@Override
public void onAnimationEnd(Animator animation) {
recentsView.finishRecentsAnimation(false /* toRecents */, () -> {
@@ -677,7 +680,6 @@ public final class TaskViewUtils {
dockFadeAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation);
if (shown) {
for (SurfaceControl leash : auxiliarySurfaces) {
t.setAlpha(leash, 0);
@@ -689,7 +691,6 @@ public final class TaskViewUtils {
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
if (!shown) {
for (SurfaceControl leash : auxiliarySurfaces) {
t.hide(leash);