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

Commit 93f724b0 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Recalculate input method top edge."

parents 8a9225eb 4774f6a4

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

+2 −2
Original line number Diff line number Diff line
@@ -4025,7 +4025,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private void offsetInputMethodWindowLw(WindowState win) {

        int top = win.getDisplayFrameLw().top;

        int top = Math.max(win.getDisplayFrameLw().top, win.getContentFrameLw().top);

        top += win.getGivenContentInsetsLw().top;

        if (mContentBottom > top) {

            mContentBottom = top;
@@ -4044,7 +4044,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private void offsetVoiceInputWindowLw(WindowState win) {

        int top = win.getDisplayFrameLw().top;

        int top = Math.max(win.getDisplayFrameLw().top, win.getContentFrameLw().top);

        top += win.getGivenContentInsetsLw().top;

        if (mVoiceContentBottom > top) {

            mVoiceContentBottom = top;