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

Commit 96ee76d1 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Check both parent and current windowing mode for legacy insets override" into main

parents 234cd0c5 79ea1505

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

+5 −1
Original line number Diff line number Diff line
@@ -8699,7 +8699,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            rotation = mDisplayContent.getRotation();

        }

        if (!mOptOutEdgeToEdge && (!mResolveConfigHint.mUseOverrideInsetsForConfig

                || getCompatDisplayInsets() != null || isFloating(parentWindowingMode)

                || getCompatDisplayInsets() != null

                || (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