diff options
| author | 2020-01-28 21:33:15 +0000 | |
|---|---|---|
| committer | 2020-01-28 21:33:15 +0000 | |
| commit | f0a9dd1e946bc3b337d9b09e3517ffad62a94ff3 (patch) | |
| tree | 532ec0118c557115cedd9d856846e5335ff326c9 | |
| parent | 1b1bdd3642517cbb9b0986bbe0fe7cc2d5b8b49c (diff) | |
| parent | 599d83cbe4da3a7e080f9b120251089919c636f9 (diff) | |
Merge "IME Layering: Don't assign relative layering in all multi-window modes"
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index e4bf2ed61f07..c50048eeab64 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -4730,7 +4730,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo // exists so it get's layered above the starting window. if (imeTarget != null && !(imeTarget.mActivityRecord != null && imeTarget.mActivityRecord.hasStartingWindow()) && ( - !(imeTarget.inSplitScreenWindowingMode() + !(imeTarget.inMultiWindowMode() || imeTarget.mToken.isAppTransitioning()) && ( imeTarget.getSurfaceControl() != null))) { mImeWindowsContainers.assignRelativeLayer(t, imeTarget.getSurfaceControl(), |