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

Commit f815e1b8 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Place InputMethod after DockedDivider in window list." into nyc-dev

parents 3c5ceae1 e63e01a6

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

+5 −1
Original line number Diff line number Diff line
@@ -663,4 +663,8 @@ public class DockedStackDividerController implements DimLayerUser { 
    public String toShortString() {

        return TAG;

    }



    WindowState getWindow() {

        return mWindow;

    }

}

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

+10 −0
Original line number Diff line number Diff line
@@ -1563,6 +1563,16 @@ public class WindowManagerService extends IWindowManager.Stub 
                    mLayersController.setInputMethodAnimLayerAdjustment(0);

                }

            }



            // If the docked divider is visible, we still need to go through this whole

            // excercise to find the appropriate input method target (used for animations

            // and dialog adjustments), but for purposes of Z ordering we simply wish to

            // place it above the docked divider.

            WindowState dockedDivider = w.mDisplayContent.mDividerControllerLocked.getWindow();

            if (dockedDivider != null && dockedDivider.isVisibleLw()) {

                int dividerIndex = windows.indexOf(dockedDivider);

                return dividerIndex > 0 ? dividerIndex + 1 : i + 1;

            }

            return i+1;

        }

        if (willMove) {