commit 817ebdd94d6e31caf8371587c553a5ba17a03c2a
author Jorim Jaggi <jjaggi@google.com> Mon Mar 26 15:46:01 2018 +0200
committer Jorim Jaggi <jjaggi@google.com> Tue Mar 27 14:15:22 2018 +0200
tree c14fa74e7fdfef94af8d357308abf730050dd6c5
parent c6d9f7ce1d6d152c55431e9ea95302a954bc49b9

Handle insets for letterboxing correctly

Add letterbox insets to main window insets to get the correct
amount of insets.

Test: Go to recents in landscape with cutout.
Change-Id: I45882d5fb3166252e4b4a333177211623fae34b0
Fixes: 72757033

services/core/java/com/android/server/wm/RemoteAnimationController.java

diff --git a/services/core/java/com/android/server/wm/RemoteAnimationController.java b/services/core/java/com/android/server/wm/RemoteAnimationController.java
index c590067..88577d0 100644
--- a/services/core/java/com/android/server/wm/RemoteAnimationController.java
+++ b/services/core/java/com/android/server/wm/RemoteAnimationController.java
@@ -37,6 +37,7 @@
 
 import com.android.internal.util.FastPrintWriter;
 import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;
+import com.android.server.wm.utils.InsetUtils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -235,9 +236,11 @@
                     || mCapturedLeash == null) {
                 return null;
             }
+            final Rect insets = new Rect(mainWindow.mContentInsets);
+            InsetUtils.addInsets(insets, mAppWindowToken.getLetterboxInsets());
             mTarget = new RemoteAnimationTarget(task.mTaskId, getMode(),
                     mCapturedLeash, !mAppWindowToken.fillsParent(),
-                    mainWindow.mWinAnimator.mLastClipRect, mainWindow.mContentInsets,
+                    mainWindow.mWinAnimator.mLastClipRect, insets,
                     mAppWindowToken.getPrefixOrderIndex(), mPosition, mStackBounds,
                     task.getWindowConfiguration(), false /*isNotInRecents*/);
             return mTarget;