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

Merge "Better handling of confused finish transition." into nyc-dev

Browse Source 
am: 2fd9cd7cbb

* commit '2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
  Better handling of confused finish transition.

Change-Id: I0b43e01df97b98a7b646999999611c7aafbea33a
This commit is contained in:
George Mount
2016-05-31 21:38:07 +00:00
committed by android-build-merger
parent b86c149e60 2fd9cd7cbb
commit eb18c0fa69
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityTransitionState.java
View File

@@ -284,7 +284,7 @@ class ActivityTransitionState {
} }
public boolean startExitBackTransition(final Activity activity) { public boolean startExitBackTransition(final Activity activity) {
if (mEnteringNames == null) { if (mEnteringNames == null || mCalledExitCoordinator != null) {
return false; return false;
} else { } else {
if (!mHasExited) { if (!mHasExited) {

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

@@ -150,6 +150,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
} }
}; };
decor.getViewTreeObserver().addOnPreDrawListener(mViewsReadyListener); decor.getViewTreeObserver().addOnPreDrawListener(mViewsReadyListener);
decor.invalidate();
} }
} }