Merge "Ignore letterbox insets for back animation target." into main (4a46fdd8) · Commits · e / os / android_frameworks_base

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

+5 −10

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ import android.window.TaskSnapshot;
		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 @@ class BackNavigationController {
		return null;
		}
		final WindowState mainWindow = r.findMainWindow();
		Rect insets;
		if (mainWindow != null) {
		insets = mainWindow.getInsetsStateWithVisibilityOverride().calculateInsets(
		final Rect insets = mainWindow != null
		? mainWindow.getInsetsStateWithVisibilityOverride().calculateInsets(
		mBounds, WindowInsets.Type.tappableElement(),
		false /* ignoreVisibility */).toRect();
		InsetUtils.addInsets(insets, mainWindow.mActivityRecord.getLetterboxInsets());
		} else {
		insets = new Rect();
		}
		false /* ignoreVisibility */).toRect()
		: new Rect();
		final int mode = mIsOpen ? MODE_OPENING : MODE_CLOSING;
		mAnimationTarget = new RemoteAnimationTarget(t.mTaskId, mode, mCapturedLeash,
		!r.fillsParent(), new Rect(),