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

Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67f1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936460

Change-Id: I9eb11d6ad4f4583269811ba77e8aa4b76f17c3e0
This commit is contained in:
TreeHugger Robot
2020-06-22 03:18:55 +00:00
committed by Automerger Merge Worker
parent 6f20b9f80e 48e9dc67f1
commit 35b794f35e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -434,8 +434,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
mSharedElementNotified = true; mSharedElementNotified = true;
delayCancel(); delayCancel();
if (!mActivity.isTopOfTask() || (mIsReturning && !mActivity.isTaskRoot() if (!mActivity.isTopOfTask()) {
&& !mSharedElements.isEmpty())) {
mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null); mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null);
} }