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

am a9d6e6e3: am e3842811: am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev

Browse Source 
* commit 'a9d6e6e3088e36ba731a801e676045bf65e557a8':
  ActivityTransition: fix activity not finished on back
This commit is contained in:
Dake Gu
2014-09-03 18:04:32 +00:00
committed by Android Git Automerger
parent 8ed0015f2c fa28163129
commit 103fc6da2a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
private void sendSharedElementDestination() {
boolean allReady;
if (allowOverlappingTransitions()) {
if (allowOverlappingTransitions() && getEnterViewsTransition() != null) {
allReady = false;
} else {
allReady = !getDecor().isLayoutRequested();

3
core/java/android/app/ExitTransitionCoordinator.java
View File

@@ -140,7 +140,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
if (getDecor() != null) {
getDecor().suppressLayout(true);
}
if (!mSharedElements.isEmpty() && getSharedElementTransition() != null) {
if (mExitSharedElementBundle != null && !mExitSharedElementBundle.isEmpty() &&
!mSharedElements.isEmpty() && getSharedElementTransition() != null) {
startTransition(new Runnable() {
public void run() {
startSharedElementExit();