Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 016cbf40 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Fix cross task back window clipping with pinned taskbar" into main

parents 6b71e97a 1af80b0c

libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ public class CrossTaskBackAnimation extends ShellBackAnimation { 
        mStartTaskRect.set(mClosingTarget.windowConfiguration.getBounds());

        mStartTaskRect.offsetTo(0, 0);



        // inset bottom in case of pinned taskbar being present

        mStartTaskRect.inset(0, 0, 0, mClosingTarget.contentInsets.bottom);



        // Draw background.

        mBackground.ensureBackground(mClosingTarget.windowConfiguration.getBounds(),

                BACKGROUNDCOLOR, mTransaction);

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

+1 −1
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ class BackNavigationController { 
                Rect insets;

                if (mainWindow != null) {

                    insets = mainWindow.getInsetsStateWithVisibilityOverride().calculateInsets(

                            mBounds, WindowInsets.Type.systemBars(),

                            mBounds, WindowInsets.Type.tappableElement(),

                            false /* ignoreVisibility */).toRect();

                    InsetUtils.addInsets(insets, mainWindow.mActivityRecord.getLetterboxInsets());

                } else {