diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/EnterTransitionCoordinator.java | 6 | ||||
| -rw-r--r-- | core/java/android/app/ExitTransitionCoordinator.java | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java index ddd0ae90fc5c..d89c0e0ef6f2 100644 --- a/core/java/android/app/EnterTransitionCoordinator.java +++ b/core/java/android/app/EnterTransitionCoordinator.java @@ -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(); } diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java index d54ffa0b23f9..ce017f68f082 100644 --- a/core/java/android/app/ExitTransitionCoordinator.java +++ b/core/java/android/app/ExitTransitionCoordinator.java @@ -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 { |