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

Commit bf22c39a authored by David Lin's avatar David Lin Committed by Android (Google) Code Review
Browse files

Merge "Check both parent and current windowing mode for legacy insets override" into 24D1-dev

parents 01ea3448 0415fc05

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

+5 −1
Original line number Diff line number Diff line
@@ -8652,7 +8652,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

        if (!mResolveConfigHint.mUseOverrideInsetsForStableBounds

                || getCompatDisplayInsets() != null || shouldCreateCompatDisplayInsets()

                || isFloating(parentWindowingMode) || rotation == ROTATION_UNDEFINED) {

                || (isFloating(parentWindowingMode)

                        // Check the windowing mode of activity as well in case it is switching

                        // between PiP and fullscreen.

                        && isFloating(inOutConfig.windowConfiguration.getWindowingMode()))

                || rotation == ROTATION_UNDEFINED) {

            // If the insets configuration decoupled logic is not enabled for the app, or the app

            // already has a compat override, or the context doesn't contain enough info to

            // calculate the override, skip the override.