From 4adc87e9825e5fa36a0a4beb6f46cf76a20bb5de Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Thu, 9 Sep 2021 11:07:36 +0000 Subject: [PATCH] Retain full opacity during task dismissal unless in bottom grid row. Test: manual Fix: 197645552 Change-Id: Ifff60f83679eacae4cd5850ed670d96287330082 --- .../src/com/android/quickstep/views/RecentsView.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 8c376440f7..5e4cf06a78 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -29,7 +29,6 @@ import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA; import static com.android.launcher3.LauncherState.BACKGROUND_APP; import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION; import static com.android.launcher3.Utilities.EDGE_NAV_BAR; -import static com.android.launcher3.Utilities.boundToRange; import static com.android.launcher3.Utilities.mapToRange; import static com.android.launcher3.Utilities.squaredHypot; import static com.android.launcher3.Utilities.squaredTouchSlop; @@ -37,6 +36,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.ACCEL_0_75; import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL; import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; +import static com.android.launcher3.anim.Interpolators.FINAL_FRAME; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.anim.Interpolators.clampToProgress; import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; @@ -2593,10 +2593,13 @@ public abstract class RecentsView { TransformParams params = remoteTargetHandle.mTransformParams; anim.setFloat(params, TransformParams.TARGET_ALPHA, 0, - clampToProgress(ACCEL, 0, 0.5f)); + clampToProgress(FINAL_FRAME, 0, 0.5f)); }); } - anim.setFloat(taskView, VIEW_ALPHA, 0, clampToProgress(ACCEL, 0, 0.5f)); + boolean isTaskInBottomGridRow = showAsGrid() && !mTopRowIdSet.contains( + taskView.getTaskViewId()) && taskView.getTaskViewId() != mFocusedTaskViewId; + anim.setFloat(taskView, VIEW_ALPHA, 0, + clampToProgress(isTaskInBottomGridRow ? ACCEL : FINAL_FRAME, 0, 0.5f)); FloatProperty secondaryViewTranslate = taskView.getSecondaryDissmissTranslationProperty(); int secondaryTaskDimension = mOrientationHandler.getSecondaryDimension(taskView);