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

Commit caa58387 authored by wilsonshih's avatar wilsonshih
Browse files

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
parent cd85aff3

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

+5 −10
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ import android.window.TaskSnapshot; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.policy.TransitionAnimation;

import com.android.internal.policy.TransitionAnimation;

import com.android.internal.protolog.common.ProtoLog;

import com.android.internal.protolog.common.ProtoLog;

import com.android.server.wm.utils.InsetUtils;

import com.android.window.flags.Flags;

import com.android.window.flags.Flags;





import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -1436,15 +1435,11 @@ class BackNavigationController { 
                    return null;

                    return null;

                }

                }

                final WindowState mainWindow = r.findMainWindow();

                final WindowState mainWindow = r.findMainWindow();

                Rect insets;

                final Rect insets = mainWindow != null

                if (mainWindow != null) {

                        ? mainWindow.getInsetsStateWithVisibilityOverride().calculateInsets(

                    insets = mainWindow.getInsetsStateWithVisibilityOverride().calculateInsets(

                                mBounds, WindowInsets.Type.tappableElement(),

                                mBounds, WindowInsets.Type.tappableElement(),

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

                                false /* ignoreVisibility */).toRect()

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

                        : new Rect();

                } else {

                    insets = new Rect();

                }

                final int mode = mIsOpen ? MODE_OPENING : MODE_CLOSING;

                final int mode = mIsOpen ? MODE_OPENING : MODE_CLOSING;

                mAnimationTarget = new RemoteAnimationTarget(t.mTaskId, mode, mCapturedLeash,

                mAnimationTarget = new RemoteAnimationTarget(t.mTaskId, mode, mCapturedLeash,

                        !r.fillsParent(), new Rect(),

                        !r.fillsParent(), new Rect(),