Merge "Attach PipSnapshotContentOverlay in PipTransition" into udc-dev
This commit is contained in:
@@ -53,6 +53,7 @@ import android.os.SystemProperties;
|
|||||||
import android.view.Surface;
|
import android.view.Surface;
|
||||||
import android.view.SurfaceControl;
|
import android.view.SurfaceControl;
|
||||||
import android.view.WindowManager;
|
import android.view.WindowManager;
|
||||||
|
import android.window.TaskSnapshot;
|
||||||
import android.window.TransitionInfo;
|
import android.window.TransitionInfo;
|
||||||
import android.window.TransitionRequestInfo;
|
import android.window.TransitionRequestInfo;
|
||||||
import android.window.WindowContainerToken;
|
import android.window.WindowContainerToken;
|
||||||
@@ -875,6 +876,14 @@ public class PipTransition extends PipTransitionController {
|
|||||||
} else {
|
} else {
|
||||||
animator.setColorContentOverlay(mContext);
|
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) {
|
} else if (enterAnimationType == ANIM_TYPE_ALPHA) {
|
||||||
animator = mPipAnimationController.getAnimator(taskInfo, leash, destinationBounds,
|
animator = mPipAnimationController.getAnimator(taskInfo, leash, destinationBounds,
|
||||||
|
|||||||
Reference in New Issue
Block a user