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

Commit 85e60d20 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev 

am: 2c69d1ec

* commit '2c69d1ec':
  Fix IME and NavBar overlap with Direct Reply

Change-Id: I6a3b377cc8604561927c416b18e46eee167233c8
parents 2e63ef3c 2c69d1ec

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

+5 −0
Original line number Diff line number Diff line
@@ -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();