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

Merge "Activity Transitions: Don't do a shared element exit transition twice."

Browse Source
This commit is contained in:
George Mount
2014-06-25 19:45:36 +00:00
committed by Android (Google) Code Review
parent 1677b6b830 f451d8a6d1
commit bcd8365197
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,13 +226,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
}
private void startExitTransition() {
Transition sharedElementTransition = mSharedElements.isEmpty()
? null : getSharedElementTransition();
if (sharedElementTransition == null) {
sharedElementTransitionComplete();
}
Transition transition = mergeTransitions(sharedElementTransition,
getExitTransition());
Transition transition = getExitTransition();
if (transition != null) {
TransitionManager.beginDelayedTransition(getDecor(), transition);
setViewVisibility(mTransitioningViews, View.INVISIBLE);