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

Commit a4449d3f authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

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

am: f815e1b8

* commit 'f815e1b8':
  Place InputMethod after DockedDivider in window list.

Change-Id: I5598f74d2840150bc406b41af1b6f4ab32a37326
parents 75d4db49 f815e1b8

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