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

Merge "Avoid conflict surface reset on auto-enter-pip" into sc-v2-dev am: fdf6eedb10

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

Change-Id: Ieaaa85134e0f31cc322d63d4974aee8e3596ec6e
This commit is contained in:
Hongwei Wang
2021-11-01 20:54:56 +00:00
committed by Automerger Merge Worker
parent 62c0e2020e fdf6eedb10
commit 096a5c5a8e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenUnfoldController.java
View File

@@ -16,6 +16,7 @@
package com.android.wm.shell.fullscreen;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
import static android.util.MathUtils.lerp;
import static android.view.Display.DEFAULT_DISPLAY;
@@ -163,7 +164,10 @@ public final class FullscreenUnfoldController implements UnfoldListener,
public void onTaskVanished(ActivityManager.RunningTaskInfo taskInfo) {
AnimationContext animationContext = mAnimationContextByTaskId.get(taskInfo.taskId);
if (animationContext != null) {
resetSurface(animationContext);
// PiP task has its own cleanup path, ignore surface reset to avoid conflict.
if (taskInfo.getWindowingMode() != WINDOWING_MODE_PINNED) {
resetSurface(animationContext);
}
mAnimationContextByTaskId.remove(taskInfo.taskId);
}