From bd374dc3994ab8fa41b08f9fc1931ec019f28207 Mon Sep 17 00:00:00 2001 From: shawnlin Date: Tue, 23 Mar 2021 10:35:08 +0800 Subject: Support windowType in RemoteAnimationTargetCompat Bug: 181638132 Test: make Change-Id: I84a439866f69a66339a6b318757850f7e111ef5d (cherry picked from commit 1a27741b350f084fe41ea18ee01f3c79817203e8) --- .../android/systemui/shared/system/RemoteAnimationTargetCompat.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java index 246476abb06d..7b3aa9258d2d 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java @@ -16,6 +16,8 @@ package com.android.systemui.shared.system; +import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE; + import android.app.PictureInPictureParams; import android.app.WindowConfiguration; import android.graphics.Point; @@ -57,6 +59,7 @@ public class RemoteAnimationTargetCompat { public final Rect contentInsets; public final PictureInPictureParams pictureInPictureParams; public final int rotationChange; + public final int windowType; private final SurfaceControl mStartLeash; @@ -78,6 +81,7 @@ public class RemoteAnimationTargetCompat { rotationChange = 0; mStartLeash = app.startLeash; + windowType = app.windowType; } private static int newModeToLegacyMode(int newMode) { @@ -118,6 +122,7 @@ public class RemoteAnimationTargetCompat { pictureInPictureParams = null; mStartLeash = null; rotationChange = change.getEndRotation() - change.getStartRotation(); + windowType = INVALID_WINDOW_TYPE; } public static RemoteAnimationTargetCompat[] wrap(RemoteAnimationTarget[] apps) { -- cgit v1.2.3-59-g8ed1b