commit bd374dc3994ab8fa41b08f9fc1931ec019f28207
author shawnlin <shawnlin@google.com> Tue Mar 23 10:35:08 2021 +0800
committer Shawn Lin <shawnlin@google.com> Wed Mar 31 06:33:44 2021 +0000
tree 02b9c40d452a33c7c93b7bac77acb37736017ce8
parent de698775add1ec27f0a90df9bd4f18235b438ec8

Support windowType in RemoteAnimationTargetCompat

Bug: 181638132
Test: make
Change-Id: I84a439866f69a66339a6b318757850f7e111ef5d
(cherry picked from commit 1a27741b350f084fe41ea18ee01f3c79817203e8)

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java

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 246476a..7b3aa92 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 final Rect contentInsets;
     public final PictureInPictureParams pictureInPictureParams;
     public final int rotationChange;
+    public final int windowType;
 
     private final SurfaceControl mStartLeash;
 
@@ -78,6 +81,7 @@
         rotationChange = 0;
 
         mStartLeash = app.startLeash;
+        windowType = app.windowType;
     }
 
     private static int newModeToLegacyMode(int newMode) {
@@ -118,6 +122,7 @@
         pictureInPictureParams = null;
         mStartLeash = null;
         rotationChange = change.getEndRotation() - change.getStartRotation();
+        windowType = INVALID_WINDOW_TYPE;
     }
 
     public static RemoteAnimationTargetCompat[] wrap(RemoteAnimationTarget[] apps) {