Merge "Fix taskbar jumping when going home" into sc-v2-dev am: 3d206ca917

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16374170

Change-Id: I8ad15ee9afd48aeb05ae1e4e89503d0e683ca5a6
This commit is contained in:
Tony Wickham
2021-12-06 20:36:58 +00:00
committed by Automerger Merge Worker
@@ -195,7 +195,7 @@ import java.util.function.Supplier;
if (hasAnyFlag(changedFlags, FLAG_RESUMED)) {
boolean isResumed = isResumed();
ObjectAnimator anim = mIconAlignmentForResumedState
.animateToValue(getCurrentIconAlignmentRatio(), isResumed ? 1 : 0)
.animateToValue(isResumed ? 1 : 0)
.setDuration(duration);
anim.addListener(new AnimatorListenerAdapter() {
@@ -351,9 +351,16 @@ import java.util.function.Supplier;
private void endGestureStateOverride(boolean finishedToApp) {
mCallbacks.removeListener(this);
// Update the resumed state immediately to ensure a seamless handoff
boolean launcherResumed = !finishedToApp;
mIconAlignmentForResumedState.updateValue(launcherResumed ? 1 : 0);
updateStateForFlag(FLAG_RECENTS_ANIMATION_RUNNING, false);
updateStateForFlag(FLAG_RESUMED, launcherResumed);
applyState();
TaskbarStashController controller = mControllers.taskbarStashController;
controller.updateStateForFlag(FLAG_IN_APP, finishedToApp);
controller.applyState();