Merge "Clear mEnterTransitionCoordinator after content shows." into tm-qpr-dev (3d8c880d) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityTransitionState.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -263,6 +263,11 @@ 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 {
	@@ -271,6 +276,11 @@ 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()) {