Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Clear mEnterTransitionCoordinator after content shows."" into tm-qpr-dev am: 283b8e8680

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19435238

Change-Id: Ia4ff096f62ce492762326a8ae5bfdbc24900f9be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-08 17:56:39 +00:00
committed by Automerger Merge Worker
parent 50d6dcf98a 283b8e8680
commit ba155b7847
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/ActivityTransitionState.java
View File

@@ -263,11 +263,6 @@ class ActivityTransitionState {
// After orientation change, the onResume can come in before the top Activity has // After orientation change, the onResume can come in before the top Activity has
// left, so if the Activity is not top, wait a second for the top Activity to exit. // left, so if the Activity is not top, wait a second for the top Activity to exit.
if (mEnterTransitionCoordinator == null || activity.isTopOfTask()) { if (mEnterTransitionCoordinator == null || activity.isTopOfTask()) {
if (mEnterTransitionCoordinator != null) {
mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {
mEnterTransitionCoordinator = null;
});
}
restoreExitedViews(); restoreExitedViews();
restoreReenteringViews(); restoreReenteringViews();
} else { } else {
@@ -276,11 +271,6 @@ class ActivityTransitionState {
public void run() { public void run() {
if (mEnterTransitionCoordinator == null || if (mEnterTransitionCoordinator == null ||
mEnterTransitionCoordinator.isWaitingForRemoteExit()) { mEnterTransitionCoordinator.isWaitingForRemoteExit()) {
if (mEnterTransitionCoordinator != null) {
mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {
mEnterTransitionCoordinator = null;
});
}
restoreExitedViews(); restoreExitedViews();
restoreReenteringViews(); restoreReenteringViews();
} else if (mEnterTransitionCoordinator.isReturning()) { } else if (mEnterTransitionCoordinator.isReturning()) {