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

Commit 1ad55e6a authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Use falllback animation when going back to no icon" into sc-v2-dev

parents c1359c44 b43374e9

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

+4 −2
Original line number Diff line number Diff line
@@ -1555,11 +1555,13 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
            if (anim == null) {

                anim = new AnimatorSet();



                boolean playFallBackAnimation = mLauncher.isInState(LauncherState.ALL_APPS)

                View workspaceView = findWorkspaceView(appTargets);

                boolean isWorkspaceViewVisible = workspaceView != null

                        && !mLauncher.isInState(LauncherState.ALL_APPS);

                boolean playFallBackAnimation = !isWorkspaceViewVisible

                        && (launcherIsATargetWithMode(appTargets, MODE_OPENING)

                        || mLauncher.isForceInvisible());



                View workspaceView = findWorkspaceView(appTargets);

                boolean playWorkspaceReveal = true;

                if (mFromUnlock) {

                    anim.play(getUnlockWindowAnimator(appTargets, wallpaperTargets));