Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am: 2c69d1ecae

am: 85e60d203e

* commit '85e60d203e4ec8d1c1db9ff55cdc6057a48a7812':
  Fix IME and NavBar overlap with Direct Reply

Change-Id: I030e9b054ed62cb676223a1c1638e0da047002ed

services/core/java/com/android/server/policy/PhoneWindowManager.java

@@ -4360,6 +4360,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             pf.bottom = df.bottom = of.bottom = mUnrestrictedScreenTop + mUnrestrictedScreenHeight;
             // ...with content insets above the nav bar
             cf.bottom = vf.bottom = mStableBottom;
+            if (mStatusBar != null && mFocusedWindow == mStatusBar && canReceiveInput(mStatusBar)) {
+                // The status bar forces the navigation bar while it's visible. Make sure the IME
+                // avoids the navigation bar in that case.
+                pf.right = df.right = of.right = cf.right = vf.right = mStableRight;
+            }
             // IM dock windows always go to the bottom of the screen.
             attrs.gravity = Gravity.BOTTOM;
             mDockLayer = win.getSurfaceLayer();