From 89b154f2f729ef5840e0824464a74f6fdf9ba82b Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Fri, 30 May 2025 16:17:18 -0700 Subject: [PATCH] Fix reverse interpolation when closing All Apps. This was inadvertently reverted in ag/33712864. Bug: 415247657 Test: Manual Flag: com.android.launcher3.all_apps_sheet_for_handheld (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e8526c5593c1e5f32136e1fb100c812b01e24746) Merged-In: Iac3be94342e7def142e31bac34ab9043e870c305 Change-Id: Iac3be94342e7def142e31bac34ab9043e870c305 --- .../android/launcher3/touch/AllAppsSwipeController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java index 5fc9560822..fc45a07962 100644 --- a/src/com/android/launcher3/touch/AllAppsSwipeController.java +++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java @@ -209,9 +209,10 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { if (!config.isUserControlled()) { config.setInterpolator(ANIM_VERTICAL_PROGRESS, EMPHASIZED); } - config.setInterpolator(ANIM_WORKSPACE_SCALE, ALL_APPS_SHEET_DEPTH); - config.setInterpolator(ANIM_HOTSEAT_SCALE, ALL_APPS_SHEET_DEPTH); - config.setInterpolator(ANIM_DEPTH, ALL_APPS_SHEET_DEPTH); + config.setInterpolator(ANIM_WORKSPACE_SCALE, + Interpolators.reverse(ALL_APPS_SHEET_DEPTH)); + config.setInterpolator(ANIM_HOTSEAT_SCALE, Interpolators.reverse(ALL_APPS_SHEET_DEPTH)); + config.setInterpolator(ANIM_DEPTH, Interpolators.reverse(ALL_APPS_SHEET_DEPTH)); if (!Flags.allAppsBlur() && launcher.getDeviceProfile().getDeviceProperties().isPhone()) { // On phones without blur, reveal the workspace and hotseat when leaving All Apps. config.setInterpolator(ANIM_WORKSPACE_FADE, INSTANT);