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

Browse Source
This commit is contained in:
Chris Li
2022-05-04 07:02:50 +00:00
committed by Android (Google) Code Review
parent e880b639cf 2333f56c29
commit 20fc9f1896
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;