Merge "Invalidate entire scene root when executing the transition." into nyc-dev (f189c2ff) · Commits · e / os / android_frameworks_base

core/java/android/app/EnterTransitionCoordinator.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -537,12 +537,10 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
		setTransitioningViewsVisiblity(View.INVISIBLE, false);
		}
		TransitionManager.beginDelayedTransition(decorView, transition);
		if (startSharedElementTransition && !mSharedElementNames.isEmpty()) {
		mSharedElements.get(0).invalidate();
		}
		if (startEnterTransition) {
		setTransitioningViewsVisiblity(View.VISIBLE, true);
		setTransitioningViewsVisiblity(View.VISIBLE, false);
		}
		decorView.invalidate();
		} else {
		transitionStarted();
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -268,7 +268,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
		if (transition != null && decorView != null && mTransitioningViews != null) {
		setTransitioningViewsVisiblity(View.VISIBLE, false);
		TransitionManager.beginDelayedTransition(decorView, transition);
		setTransitioningViewsVisiblity(View.INVISIBLE, true);
		setTransitioningViewsVisiblity(View.INVISIBLE, false);
		decorView.invalidate();
		} else {
		transitionStarted();
		}
		@@ -367,7 +368,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
		scheduleGhostVisibilityChange(View.VISIBLE);
		setGhostVisibility(View.VISIBLE);
		if (viewsTransition != null) {
		setTransitioningViewsVisiblity(View.INVISIBLE, true);
		setTransitioningViewsVisiblity(View.INVISIBLE, false);
		}
		decorView.invalidate();
		} else {