Merge "Hide the task icon during quick switch from home" into tm-qpr-dev am: bbfbe60f72

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

Change-Id: I4d8c28dcd55ba241bdf72fd108059c73044f4aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Wickham
2022-07-26 00:58:36 +00:00
committed by Automerger Merge Worker

View File

@@ -232,6 +232,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress());
mLauncher.getActionsView().getVisibilityAlpha().setValue(
(fromState.getVisibleElements(mLauncher) & OVERVIEW_ACTIONS) != 0 ? 1f : 0f);
mRecentsView.setTaskIconScaledDown(true);
float[] scaleAndOffset = toState.getOverviewScaleAndOffset(mLauncher);
// As we drag right, animate the following properties:
@@ -321,6 +322,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
boolean verticalFling = mSwipeDetector.isFling(velocity.y);
boolean noFling = !horizontalFling && !verticalFling;
if (mMotionPauseDetector.isPaused() && noFling) {
// Going to Overview.
cancelAnimations();
StateAnimationConfig config = new StateAnimationConfig();
@@ -331,6 +333,8 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
@Override
public void onAnimationEnd(Animator animation) {
onAnimationToStateCompleted(OVERVIEW);
// Animate the icon after onAnimationToStateCompleted() so it doesn't clobber.
mRecentsView.animateUpTaskIconScale();
}
});
overviewAnim.start();