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

Merge "Fix Pair-to-Pair animation being canceled in recents transition handler." into udc-dev am: 0d295f9da0

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

Change-Id: Ied72ebd7046432ebdb4eda86c016b24d75753280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2023-06-08 07:23:19 +00:00
committed by Automerger Merge Worker
parent 3db8b72446 0d295f9da0
commit c0b6fd946c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java
View File

@@ -595,8 +595,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
cancel(mWillFinishToHome, true /* withScreenshots */, "display change"); cancel(mWillFinishToHome, true /* withScreenshots */, "display change");
return; return;
} }
// Don't consider order-only changes as changing apps. // Don't consider order-only & non-leaf changes as changing apps.
if (!TransitionUtil.isOrderOnly(change)) { if (!TransitionUtil.isOrderOnly(change) && isLeafTask) {
hasChangingApp = true; hasChangingApp = true;
} }
} }