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

Commit cd30d43a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Provide IME insets to freeform windows in the same task as IME target" into main

parents 0671cc5f 0d4cfb7f

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

+6 −5
Original line number Diff line number Diff line
@@ -443,12 +443,13 @@ class InsetsPolicy { 
                || (windowingMode == WINDOWING_MODE_MULTI_WINDOW && target.isAlwaysOnTop())) {

            // Keep frames, caption, and IME.

            int types = WindowInsets.Type.captionBar();

            if (windowingMode != WINDOWING_MODE_PINNED) {

                if ((mDisplayContent != null && target == mDisplayContent.getImeInputTarget()

                        && (WindowInsets.Type.ime() & target.getRequestedVisibleTypes()) != 0)) {

            if (windowingMode != WINDOWING_MODE_PINNED

                    && mDisplayContent.getImeInputTarget() instanceof WindowState imeTarget

                    && (target == imeTarget

                    || (target.getTask() != null && target.getTask() == imeTarget.getTask()))

                    && imeTarget.isRequestedVisible(WindowInsets.Type.ime())) {

                types |= WindowInsets.Type.ime();

            }

            }

            final InsetsState newState = new InsetsState();

            newState.set(state, types);

            state = newState;