Merge "Import translations. DO NOT MERGE" into ub-launcher3-master
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 30e8c88..243395d 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -809,18 +809,22 @@
postAtFrontOfQueueAsynchronously(handler, () -> {
if ((Utilities.getPrefs(mLauncher)
.getBoolean("pref_use_screenshot_for_swipe_up", false)
- && mLauncher.getStateManager().getState().overviewUi)
- || !launcherIsATargetWithMode(targets, MODE_OPENING)) {
- // We use a separate transition for Overview mode. And we can skip the
- // animation in cases where Launcher is not in the set of opening targets.
- // This can happen when Launcher is already visible. ie. Closing a dialog.
+ && mLauncher.getStateManager().getState().overviewUi)) {
+ // We use a separate transition for Overview mode.
setCurrentAnimator(null);
finishedCallback.run();
return;
}
+ // We can skip the Launcher content animation in cases where Launcher is not in
+ // the set of opening targets. This can happen when Launcher is already visible.
+ // ie. closing a dialog. We still need to animate the window though.
LauncherTransitionAnimator animator = new LauncherTransitionAnimator(
- getLauncherResumeAnimation(), getClosingWindowAnimators(targets));
+ launcherIsATargetWithMode(targets, MODE_OPENING)
+ ? getLauncherResumeAnimation()
+ : null,
+ getClosingWindowAnimators(targets));
+
setCurrentAnimator(animator);
mAnimator = animator.getAnimatorSet();
mAnimator.addListener(new AnimatorListenerAdapter() {