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

Commit 746613f5 authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Merge "Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is... 

Merge "Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is playing" into udc-qpr-dev am: c4808607

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



Change-Id: Ifc40189607fa0c02c6ff7ad14b853af460cac6d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4bbe54f c4808607

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+4 −2
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATI 
import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;

import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;

import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;

import static com.android.systemui.shared.system.InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME;

import static com.android.systemui.shared.system.InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME_FALLBACK;

import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;

import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;
@@ -1634,8 +1636,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        // invisibility on touch down, and only reset it after the animation to home

        // is initialized.

        if (launcherIsForceInvisibleOrOpening) {

            addCujInstrumentation(

                    anim, InteractionJankMonitorWrapper.CUJ_APP_CLOSE_TO_HOME);

            addCujInstrumentation(anim, playFallBackAnimation

                    ? CUJ_APP_CLOSE_TO_HOME_FALLBACK :  CUJ_APP_CLOSE_TO_HOME);

            // Only register the content animation for cancellation when state changes

            mLauncher.getStateManager().setCurrentAnimation(anim);