diff options
| author | George Mount <mount@google.com> | 2016-03-23 11:08:39 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2016-03-23 14:01:35 -0700 |
| commit | 52ff2b7798bdf5576b056663d45d2b491853c04e (patch) | |
| tree | e708bcb5c8f6db6689abc2e17efd817a797ddcaa /core/java/android | |
| parent | 3e2b413dc72f267571421cfb0c8ced7a4778704a (diff) | |
Invalidate entire scene root when executing the transition.
Bug 27778109
When switching from forced visibility to using real visibility,
I didn't take into account the fact that invalidating INVISIBLE
Views skip invalidation. This CL invalidates the scene root
to ensure that the transition is properly executed.
Change-Id: I092d0fe42229390927f7d1b65fc2b3ce5fc2938d
Diffstat (limited to 'core/java/android')
| -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 { |