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

Revert "Clear mEnterTransitionCoordinator after content shows."

Browse Source 
This reverts commit 8aef548893.

Fixes: 239497474
Fixes: 239595736
Fixes: 240211711

Reason for revert: b/240211711 b/239595736 b/239497474

Change-Id: I3b13b49c91d38055b3e5b9d772dfe21e054911b6
This commit is contained in:
George Mount
2022-07-26 21:18:24 +00:00
parent 8aef548893
commit 716b33e323
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
// 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) {
mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {
mEnterTransitionCoordinator = null;
});
}
restoreExitedViews();
restoreReenteringViews();
} else {
@@ -276,11 +271,6 @@ class ActivityTransitionState {
public void run() {
if (mEnterTransitionCoordinator == null ||
mEnterTransitionCoordinator.isWaitingForRemoteExit()) {
if (mEnterTransitionCoordinator != null) {
mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {
mEnterTransitionCoordinator = null;
});
}
restoreExitedViews();
restoreReenteringViews();
} else if (mEnterTransitionCoordinator.isReturning()) {