Merge "Ignore letterbox insets for back animation target." into main
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(),