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

This commit is contained in:
Tony Wickham
2021-09-28 21:19:38 +00:00
committed by Android (Google) Code Review

View File

@@ -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));