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

Commit 0d4cfb7f authored by Hiroki Sato's avatar Hiroki Sato
Browse files

Provide IME insets to freeform windows in the same task as IME target 

After the change [1], for freeform windows, IME insets are provided only
when the target window is equals to the IME target.

However, we'd like to provide the IME insets as long as the target is in
the same task as the ime target window. This helps, for example,  a case
where non-input-focusable but ime-focusable dialog window monitors IME
insets.

[1] Id376f73b7c3b0315834e9be4eecc21a826db85fc

Bug: 440265933
Test: ImeInsetsVisibilityTest
Flag: EXEMPT bug fix
Change-Id: Ieb5d7b40e18453a54806bcc2239681c2ba69606c
parent 18f6c440

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;