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

Merge "Invalidate entire scene root when executing the transition." into nyc-dev

Browse Source
This commit is contained in:
George Mount
2016-03-24 14:45:21 +00:00
committed by Android (Google) Code Review
parent 3e5bf786b7 52ff2b7798
commit f189c2ffa2
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/EnterTransitionCoordinator.java
View File

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

5
core/java/android/app/ExitTransitionCoordinator.java
View File

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