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 am: 2fd9cd7cbb

Browse Source 
am: 27a0e5a632

* commit '27a0e5a6323cd8712c34f6da9bacbecd6f6b51f8':
  Better handling of confused finish transition.

Change-Id: I0da6175da030570bd26117f1cd1e33a7ddf2c51d
This commit is contained in:
George Mount
2016-05-31 21:42:16 +00:00
committed by android-build-merger
parent f864ebdde5 27a0e5a632
commit cf653fa891
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();
} }
} }