From d82b748b268dbd35e02d21eb7cc6be7b19484f5f Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Sun, 17 Apr 2016 19:45:24 -0700 Subject: [PATCH] Promote input method dialogs layers with input method. When raising the layer of the input method window we also have to raise the layer of its assosciated dialogs which thankfully are already collected for us. Bug: 28138068 Bug: 28186814 Change-Id: I4e63a642199c5aad3b3322e773df287ced80d641 --- .../java/com/android/server/wm/WindowLayersController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/wm/WindowLayersController.java b/services/core/java/com/android/server/wm/WindowLayersController.java index 6bdcd42ee0814..2722eedfedf0b 100644 --- a/services/core/java/com/android/server/wm/WindowLayersController.java +++ b/services/core/java/com/android/server/wm/WindowLayersController.java @@ -203,6 +203,10 @@ public class WindowLayersController { if (mDockDivider != null && mDockDivider.isVisibleLw() && mService.mInputMethodWindow != null) { layer = assignAndIncreaseLayerIfNeeded(mService.mInputMethodWindow, layer); + for (int i = mService.mInputMethodDialogs.size() - 1; i >= 0; i--) { + final WindowState dialog = mService.mInputMethodDialogs.get(i); + layer = assignAndIncreaseLayerIfNeeded(dialog, layer); + } } // We know that we will be animating a relaunching window in the near future, which will