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

Commit 65bff3e4 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix Keyboard overlap with navigation bar 

FLAG_FULLSCREEN is really the wrong flag for determining whether
to subtract the window insets in the decore view and layout
it with a reduced size - FLAG_LAYOUT_IN_SCREEN suits these needs
much better.

Bug: 26014496
Bug: 26984057
Change-Id: I5c7a0fb7468d3981b91b23aa4c8b1e4841202131
parent 4f4c6082

core/java/com/android/internal/policy/DecorView.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -86,6 +86,7 @@ import static android.view.Window.DECOR_CAPTION_SHADE_DARK; 
import static android.view.Window.DECOR_CAPTION_SHADE_LIGHT;

import static android.view.Window.DECOR_CAPTION_SHADE_LIGHT;

import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

import static android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN;

import static android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;

import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION;

import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION;

import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;

import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
@@ -615,7 +616,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
                if (h > 0) {

                if (h > 0) {

                    heightMeasureSpec = MeasureSpec.makeMeasureSpec(

                    heightMeasureSpec = MeasureSpec.makeMeasureSpec(

                            Math.min(h, heightSize), EXACTLY);

                            Math.min(h, heightSize), EXACTLY);

                } else if ((mWindow.getAttributes().flags & FLAG_FULLSCREEN) == 0) {

                } else if ((mWindow.getAttributes().flags & FLAG_LAYOUT_IN_SCREEN) == 0) {

                    heightMeasureSpec = MeasureSpec.makeMeasureSpec(

                    heightMeasureSpec = MeasureSpec.makeMeasureSpec(

                            heightSize - mFloatingInsets.top - mFloatingInsets.bottom, AT_MOST);

                            heightSize - mFloatingInsets.top - mFloatingInsets.bottom, AT_MOST);

                    mApplyFloatingVerticalInsets = true;

                    mApplyFloatingVerticalInsets = true;
@@ -890,10 +891,11 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
    public WindowInsets onApplyWindowInsets(WindowInsets insets) {

    public WindowInsets onApplyWindowInsets(WindowInsets insets) {

        final WindowManager.LayoutParams attrs = mWindow.getAttributes();

        final WindowManager.LayoutParams attrs = mWindow.getAttributes();

        mFloatingInsets.setEmpty();

        mFloatingInsets.setEmpty();

        if ((attrs.flags & FLAG_FULLSCREEN) == 0) {

        if ((attrs.flags & FLAG_LAYOUT_IN_SCREEN) == 0) {

            // For dialog windows we want to make sure they don't go over the status bar or nav bar.

            // For dialog windows we want to make sure they don't go over the status bar or nav bar.

            // We consume the system insets and we will reuse them later during the measure phase.

            // We consume the system insets and we will reuse them later during the measure phase.

            // We allow the app to ignore this and handle insets itself by using FLAG_FULLSCREEN.

            // We allow the app to ignore this and handle insets itself by using

            // FLAG_LAYOUT_IN_SCREEN.

            if (attrs.height == WindowManager.LayoutParams.WRAP_CONTENT) {

            if (attrs.height == WindowManager.LayoutParams.WRAP_CONTENT) {

                mFloatingInsets.top = insets.getSystemWindowInsetTop();

                mFloatingInsets.top = insets.getSystemWindowInsetTop();

                mFloatingInsets.bottom = insets.getSystemWindowInsetBottom();

                mFloatingInsets.bottom = insets.getSystemWindowInsetBottom();