summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Carr <racarr@google.com> 2016-04-17 19:45:24 -0700
committer Robert Carr <racarr@google.com> 2016-04-17 19:47:10 -0700
commitd82b748b268dbd35e02d21eb7cc6be7b19484f5f (patch)
tree191d1a569936fdfc5a40a6967af3ceb6eb65b2e7
parentfd580f7d1a5a19b062bea49602f0f6136bce7e5e (diff)
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
-rw-r--r--services/core/java/com/android/server/wm/WindowLayersController.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowLayersController.java b/services/core/java/com/android/server/wm/WindowLayersController.java
index 6bdcd42ee081..2722eedfedf0 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