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

Commit 1af80b0c authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Fix cross task back window clipping with pinned taskbar 

Bug: 315461656
Flag: Flag: ACONFIG com.android.systemui.predictive_back_system_animations STAGING
Test: Manual, i.e. visually verifying cross task back behaviour on Felix
Change-Id: I05a80b7b0a5766640d47ddb6b38150aa9aafd256
parent af3dba48

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 {