From a36af25ab7b56fbca10221175b5be6bd9ebec9d6 Mon Sep 17 00:00:00 2001 From: Luca Zuccarini Date: Tue, 31 May 2022 13:50:28 +0000 Subject: [PATCH] Remove workspace fade from ALL_APPS > NORMAL transition. This applies to phones only for the one-off transition (Home gesture or swipe back. See before and after videos in the bug. Bug: 234359814 Test: manual Change-Id: I8f4fc9ec40687b641a721bd28b32fcf50514861f --- .../uioverrides/states/QuickstepAtomicAnimationFactory.java | 3 +++ src/com/android/launcher3/touch/AllAppsSwipeController.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java index f2162b03af..2d7fe69d3b 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java @@ -191,6 +191,9 @@ public class QuickstepAtomicAnimationFactory extends 1 - ALL_APPS_SCRIM_OPAQUE_THRESHOLD, 1 - ALL_APPS_SCRIM_VISIBLE_THRESHOLD)); config.setInterpolator(ANIM_VERTICAL_PROGRESS, EMPHASIZED_ACCELERATE); + if (!isTablet) { + config.setInterpolator(ANIM_WORKSPACE_FADE, INSTANT); + } } else if (fromState == NORMAL && toState == ALL_APPS) { if (mActivity.getDeviceProfile().isTablet) { config.setInterpolator(ANIM_VERTICAL_PROGRESS, EMPHASIZED_DECELERATE); diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java index 787d9ea8e0..bbdd7b16f8 100644 --- a/src/com/android/launcher3/touch/AllAppsSwipeController.java +++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java @@ -157,6 +157,9 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { config.setInterpolator(ANIM_SCRIM_FADE, ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); config.setInterpolator(ANIM_ALL_APPS_FADE, isTablet ? FINAL_FRAME : ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); + if (!isTablet) { + config.setInterpolator(ANIM_WORKSPACE_FADE, INSTANT); + } } /**