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

Commit f98b1d4d authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Revert "Do not set docked divider as IME target." 

This reverts commit ebe9c0db [1],
because it caused a regression that IME window becomes transparent on
the lock screen (Bug 28013209).

 [1]: I7d406cc88aae40a8b22c1fc1d856ccb7b6bb4558

Bug: 26387930
Bug: 28013209
Change-Id: I11243703030e34b917136b69a35245e9ef73c87c
parent b00ff01f

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

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

        }





        layer = assignAndIncreaseLayerIfNeeded(mDockDivider, layer);

        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

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

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

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

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

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

+1 −1
Original line number Original line 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

        // 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.

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

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

        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) {

            if (DEBUG_INPUT_METHOD) {

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

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

                if (!w.isVisibleOrAdding()) {

                if (!w.isVisibleOrAdding()) {