| commit | d3a7d37a57e19a10bb1057df7ad93f22552da9f4 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Wed Jun 08 03:50:20 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 08 03:50:20 2022 +0000 |
| tree | d88ed5e607948fae3229ce593919453232d1017c | |
| parent | c41cee6e48ab9c45d2c29c8cda07b56b8dcd000b [diff] | |
| parent | 0cf33355a01ef6921fcc1c57cda10cc2895d41e3 [diff] |
Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 0cf33355a0 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661 Change-Id: I8b0f3b1e6a93f124ba16506872372f6e856dabf2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 06dad8a..e1a3b72 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1698,15 +1698,6 @@ return; } - if (!mLauncher.hasBeenResumed()) { - // If launcher is not resumed, wait until new async-frame after resume - mLauncher.addOnResumeCallback(() -> - postAsyncCallback(mHandler, () -> - onCreateAnimation(transit, appTargets, wallpaperTargets, - nonAppTargets, result))); - return; - } - if (mLauncher.hasSomeInvisibleFlag(PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION)) { mLauncher.addForceInvisibleFlag(INVISIBLE_BY_PENDING_FLAGS); mLauncher.getStateManager().moveToRestState();