commit caa58387f41e775eacee7541fd490228df3e02ff
author wilsonshih <wilsonshih@google.com> Fri Mar 08 06:02:31 2024 +0000
committer wilsonshih <wilsonshih@google.com> Fri Mar 08 09:49:13 2024 +0000
tree d09d502bff223ebfe6e39de500c5fc097db22a3e
parent cd85aff36233b6dc28fc7bd690767f7f0bffeb84

Ignore letterbox insets for back animation target.

All animation will play the animation target with it's letterbox, so
there can ignore that insets, in case of shell being confused when
handling taskbar insets.

Bug: 328707998
Test: launch app with a bottom letterbox, verify letterbox area won't
be clip when back-to-home.

Change-Id: I195f437c04cc5dd2abe19c7f4f888dd3888296e2

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

diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java
index e155126..e0e5548 100644
--- a/services/core/java/com/android/server/wm/BackNavigationController.java
+++ b/services/core/java/com/android/server/wm/BackNavigationController.java
@@ -60,7 +60,6 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.policy.TransitionAnimation;
 import com.android.internal.protolog.common.ProtoLog;
-import com.android.server.wm.utils.InsetUtils;
 import com.android.window.flags.Flags;
 
 import java.io.PrintWriter;
@@ -1436,15 +1435,11 @@
                     return null;
                 }
                 final WindowState mainWindow = r.findMainWindow();
-                Rect insets;
-                if (mainWindow != null) {
-                    insets = mainWindow.getInsetsStateWithVisibilityOverride().calculateInsets(
-                            mBounds, WindowInsets.Type.tappableElement(),
-                            false /* ignoreVisibility */).toRect();
-                    InsetUtils.addInsets(insets, mainWindow.mActivityRecord.getLetterboxInsets());
-                } else {
-                    insets = new Rect();
-                }
+                final Rect insets = mainWindow != null
+                        ? mainWindow.getInsetsStateWithVisibilityOverride().calculateInsets(
+                                mBounds, WindowInsets.Type.tappableElement(),
+                                false /* ignoreVisibility */).toRect()
+                        : new Rect();
                 final int mode = mIsOpen ? MODE_OPENING : MODE_CLOSING;
                 mAnimationTarget = new RemoteAnimationTarget(t.mTaskId, mode, mCapturedLeash,
                         !r.fillsParent(), new Rect(),