commit | 2fd9cd7cbb7a792d041d0e0780b11b12b4591a90 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue May 31 21:31:28 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 31 21:31:31 2016 +0000 |
tree | 899a751628b5b1e2c749271cae74e9786c478763 | |
parent | 1c39a112b43e50da4e801d634e28ae7a130c0dcb [diff] | |
parent | 5ae0b7abf0d026973d556a8d6685dc2b986bf7b5 [diff] |
Merge "Better handling of confused finish transition." into nyc-dev
diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java index 4a1aff7..02eb4d3 100644 --- a/core/java/android/app/ActivityTransitionState.java +++ b/core/java/android/app/ActivityTransitionState.java
@@ -284,7 +284,7 @@ } public boolean startExitBackTransition(final Activity activity) { - if (mEnteringNames == null) { + if (mEnteringNames == null || mCalledExitCoordinator != null) { return false; } else { if (!mHasExited) {
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java index a599584..8bf1e9a 100644 --- a/core/java/android/app/EnterTransitionCoordinator.java +++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -150,6 +150,7 @@ } }; decor.getViewTreeObserver().addOnPreDrawListener(mViewsReadyListener); + decor.invalidate(); } }