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

Commit 48a425df authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Fix TaplTestsQuickstep.testPressback failure 

In the predictive back to home case, no WALLPAPER_OPEN_ANIMATION_FINISHED_MESSAGE event was sent to AccessibilityManagerCompat, which caused TaplTestsQuickstep.testPressback to fail.

Bug: 318675970
Flag: ACONFIG com.android.systemui.predictive_back_qs_dialog_anim DEVELOPMENT
Test: TaplTestsQuickstep
Change-Id: I326577575d9e51e0f9ae879bca76e9c254f4ea34
parent 78611ea4

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

+4 −6
Original line number Diff line number Diff line
@@ -1607,7 +1607,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                || mLauncher.getWorkspace().isOverlayShown()

                || shouldPlayFallbackClosingAnimation(appTargets);



        boolean playWorkspaceReveal = true;

        boolean playWorkspaceReveal = !fromPredictiveBack;

        boolean skipAllAppsScale = false;

        if (fromUnlock) {

            anim.play(getUnlockWindowAnimator(appTargets, wallpaperTargets));
@@ -1649,7 +1649,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        // targets list because it is already visible). In that case, we force

        // invisibility on touch down, and only reset it after the animation to home

        // is initialized.

        if (launcherIsForceInvisibleOrOpening) {

        if (launcherIsForceInvisibleOrOpening || fromPredictiveBack) {

            addCujInstrumentation(anim, playFallBackAnimation

                    ? Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK

                    : Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME);
@@ -1666,7 +1666,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
            // Only register the content animation for cancellation when state changes

            mLauncher.getStateManager().setCurrentAnimation(anim);



            if (mLauncher.isInState(LauncherState.ALL_APPS)) {

            if (mLauncher.isInState(LauncherState.ALL_APPS) && !fromPredictiveBack) {

                Pair<AnimatorSet, Runnable> contentAnimator =

                        getLauncherContentAnimator(false, LAUNCHER_RESUME_START_DELAY,

                                skipAllAppsScale);
@@ -1677,12 +1677,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                        contentAnimator.second.run();

                    }

                });

            } else {

                if (playWorkspaceReveal) {

            } else if (playWorkspaceReveal) {

                    anim.play(new WorkspaceRevealAnim(mLauncher, false).getAnimators());

            }

        }

        }



        return new Pair(rectFSpringAnim, anim);

    }