Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f4884f7 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Attach PipSnapshotContentOverlay in PipTransition" into udc-dev am:... 

Merge "Attach PipSnapshotContentOverlay in PipTransition" into udc-dev am: 83efc2a1 am: 8863648b

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



Change-Id: I17ebc764d82e7aaca5d9480bc7ab9b940bb3a0f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85355ad6 8863648b

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.os.SystemProperties; 
import android.view.Surface;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.window.TaskSnapshot;

import android.window.TransitionInfo;

import android.window.TransitionRequestInfo;

import android.window.WindowContainerToken;
@@ -875,6 +876,14 @@ public class PipTransition extends PipTransitionController { 
                } else {

                    animator.setColorContentOverlay(mContext);

                }

            } else {

                final TaskSnapshot snapshot = PipUtils.getTaskSnapshot(

                        taskInfo.launchIntoPipHostTaskId, false /* isLowResolution */);

                if (snapshot != null) {

                    // use the task snapshot during the animation, this is for

                    // launch-into-pip aka. content-pip use case.

                    animator.setSnapshotContentOverlay(snapshot, sourceHintRect);

                }

            }

        } else if (enterAnimationType == ANIM_TYPE_ALPHA) {

            animator = mPipAnimationController.getAnimator(taskInfo, leash, destinationBounds,