Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb49ab04 authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Automerger Merge Worker
Browse files

Merge "Remove workspace fade from ALL_APPS > NORMAL transition." into tm-dev am: 46338b09 

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



Change-Id: I24c475f36abe82a7be97334832a3820837619410
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c0a7097 46338b09

quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

src/com/android/launcher3/touch/AllAppsSwipeController.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

        }

    }



    /**