From 1f2b23dd131a783298fe035e17ad52fcae81ec41 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Wed, 24 Jan 2024 10:55:58 +0000 Subject: [PATCH] Remove extra grid interpolator in TaskView - Currently in App -> Overview animation, current task is undergo ACCELERATE_DECELERATE interpolator twice, one via interpolating GRID_PROGRESS in AbsSwipeUpHandler, one via TaskView.getGridTrans - I got rid of TaskView.getGridTrans's interpolator, and completely rely on AbsSwipeUpHandler or BaseRecentsViewStateController to apply the interpolator - Refactored BaseRecentsViewStateController to consistenly apply ACCELERATE_DECELERATE for QUICK_SWITCH_FROM_HOME -> Overview animation, and otherwise it should use INSTNAT/FINAL_FRAME Bug: 318352235 Flag: None Test: Default/3P Launcher X home/qs_from_home/app -> Overview and Overview to home Change-Id: I21ca903897f8c374e136c0ac27cec76dd3f5c1f3 --- .../BaseRecentsViewStateController.java | 19 +++++++++++-------- .../FallbackRecentsStateController.java | 9 +++++++-- .../com/android/quickstep/views/TaskView.java | 10 ++-------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java index e2f4f322a7..9329e16909 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java @@ -16,6 +16,7 @@ package com.android.launcher3.uioverrides; +import static com.android.app.animation.Interpolators.ACCELERATE_DECELERATE; import static com.android.app.animation.Interpolators.AGGRESSIVE_EASE_IN_OUT; import static com.android.app.animation.Interpolators.FINAL_FRAME; import static com.android.app.animation.Interpolators.INSTANT; @@ -132,15 +133,17 @@ public abstract class BaseRecentsViewStateController LauncherState fromState = mLauncher.getStateManager().getState(); setter.setFloat(mRecentsView, TASK_THUMBNAIL_SPLASH_ALPHA, toState.showTaskThumbnailSplash() ? 1f : 0f, - !toState.showTaskThumbnailSplash() && fromState == QUICK_SWITCH_FROM_HOME - ? LINEAR : INSTANT); + getOverviewInterpolator(fromState, toState)); - boolean showAsGrid = toState.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()); - Interpolator gridProgressInterpolator = showAsGrid - ? fromState == QUICK_SWITCH_FROM_HOME ? LINEAR : INSTANT - : FINAL_FRAME; - setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, showAsGrid ? 1f : 0f, - gridProgressInterpolator); + setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, + toState.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f, + getOverviewInterpolator(fromState, toState)); + } + + private Interpolator getOverviewInterpolator(LauncherState fromState, LauncherState toState) { + return fromState == QUICK_SWITCH_FROM_HOME + ? ACCELERATE_DECELERATE + : toState.overviewUi ? INSTANT : FINAL_FRAME; } abstract FloatProperty getTaskModalnessProperty(); diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java index 8a9e04e488..41c6f9bfb8 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java @@ -38,6 +38,7 @@ import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL; import android.util.FloatProperty; import android.util.Pair; +import android.view.animation.Interpolator; import androidx.annotation.NonNull; @@ -110,9 +111,9 @@ public class FallbackRecentsStateController implements StateHandler