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

Merge "Don't include PiP activity in app transit" into tm-dev am: 20fc9f1896

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

Change-Id: I4b2b433e29adf5326f4ef74a5d482cd724610528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-05-04 07:28:51 +00:00
committed by Automerger Merge Worker
parent 7015800dfd 20fc9f1896
commit 0b5131609f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -5096,7 +5096,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
final boolean recentsAnimating = isAnimating(PARENTS, ANIMATION_TYPE_RECENTS); final boolean recentsAnimating = isAnimating(PARENTS, ANIMATION_TYPE_RECENTS);
if (okToAnimate(true /* ignoreFrozen */, canTurnScreenOn()) if (okToAnimate(true /* ignoreFrozen */, canTurnScreenOn())
&& (appTransition.isTransitionSet() && (appTransition.isTransitionSet()
|| (recentsAnimating && !isActivityTypeHome()))) { || (recentsAnimating && !isActivityTypeHome()))
// If the visibility change during enter PIP, we don't want to include it in app
// transition to affect the animation theme, because the Pip organizer will animate
// the entering PIP instead.
&& !mWaitForEnteringPinnedMode) {
if (visible) { if (visible) {
displayContent.mOpeningApps.add(this); displayContent.mOpeningApps.add(this);
mEnteringAnimation = true; mEnteringAnimation = true;