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

Commit 0c9d1b06 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Revert "Do not set docked divider as IME target."" into nyc-dev

parents cd6ea77d f98b1d4d

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

+0 −6
Original line number Diff line number Diff line
@@ -199,12 +199,6 @@ public class WindowLayersController { 
        }



        layer = assignAndIncreaseLayerIfNeeded(mDockDivider, layer);



        // If we have a dock divider ensure the Input Method is above it.

        if (mDockDivider != null && mService.mInputMethodWindow != null) {

            layer = assignAndIncreaseLayerIfNeeded(mService.mInputMethodWindow, layer);

        }

        

        // We know that we will be animating a relaunching window in the near future, which will

        // receive a z-order increase. We want the replaced window to immediately receive the same

        // treatment, e.g. to be above the dock divider.

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

+1 −1
Original line number Diff line number Diff line
@@ -1373,7 +1373,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        // needs to sit above the dock divider, so it doesn't get cut in half. We make the dock

        // divider be a target for IME, so this relationship can occur naturally.

        if (fl == 0 || fl == (FLAG_NOT_FOCUSABLE|FLAG_ALT_FOCUSABLE_IM)

                || type == TYPE_APPLICATION_STARTING) {

                || type == TYPE_APPLICATION_STARTING || type == TYPE_DOCK_DIVIDER) {

            if (DEBUG_INPUT_METHOD) {

                Slog.i(TAG_WM, "isVisibleOrAdding " + w + ": " + w.isVisibleOrAdding());

                if (!w.isVisibleOrAdding()) {