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

Commit b03f3c86 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Automerger Merge Worker
Browse files

Merge "Fix IME hidden nav bar bottom insets" into udc-qpr-dev am: 233b4e7d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24620435



Change-Id: I4fe66ca5b2186981e690b6363a7a55f37ff75cbf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eeb25080 233b4e7d

core/java/android/inputmethodservice/NavigationBarController.java

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ final class NavigationBarController { 
                mNavigationBarFrame.setOnApplyWindowInsetsListener((view, insets) -> {

                    if (mNavigationBarFrame != null) {

                        boolean visible = insets.isVisible(captionBar());

                        mNavigationBarFrame.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);

                        mNavigationBarFrame.setVisibility(visible ? View.VISIBLE : View.GONE);

                    }

                    return view.onApplyWindowInsets(insets);

                });

services/core/java/com/android/server/wm/DisplayPolicy.java

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm;



import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.inputmethodservice.InputMethodService.ENABLE_HIDE_IME_CAPTION_BAR;

import static android.view.Display.TYPE_INTERNAL;

import static android.view.InsetsFrameProvider.SOURCE_ARBITRARY_RECTANGLE;

import static android.view.InsetsFrameProvider.SOURCE_CONTAINER_BOUNDS;
@@ -1201,8 +1202,8 @@ public class DisplayPolicy { 
                throw new IllegalArgumentException("IME insets must be provided by a window.");

            }



            if (mNavigationBar != null && navigationBarPosition(displayFrames.mRotation)

                    == NAV_BAR_BOTTOM) {

            if (!ENABLE_HIDE_IME_CAPTION_BAR && mNavigationBar != null

                    && navigationBarPosition(displayFrames.mRotation) == NAV_BAR_BOTTOM) {

                // In gesture navigation, nav bar frame is larger than frame to calculate insets.

                // IME should not provide frame which is smaller than the nav bar frame. Otherwise,

                // nav bar might be overlapped with the content of the client when IME is shown.

services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java

+5 −8
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm;



import static android.inputmethodservice.InputMethodService.ENABLE_HIDE_IME_CAPTION_BAR;

import static android.view.DisplayCutout.NO_CUTOUT;

import static android.view.InsetsSource.ID_IME;

import static android.view.RoundedCorners.NO_ROUNDED_CORNERS;
@@ -427,11 +428,11 @@ public class DisplayPolicyTests extends WindowTestsBase { 
    @SetupWindows(addWindows = { W_NAVIGATION_BAR, W_INPUT_METHOD })

    @Test

    public void testImeMinimalSourceFrame() {

        Assume.assumeFalse("Behavior no longer needed with ENABLE_HIDE_IME_CAPTION_BAR",

                ENABLE_HIDE_IME_CAPTION_BAR);



        final DisplayPolicy displayPolicy = mDisplayContent.getDisplayPolicy();

        final DisplayInfo displayInfo = new DisplayInfo();

        displayInfo.logicalWidth = 1000;

        displayInfo.logicalHeight = 2000;

        displayInfo.rotation = ROTATION_0;

        final DisplayInfo displayInfo = mDisplayContent.getDisplayInfo();



        WindowManager.LayoutParams attrs = mNavBarWindow.mAttrs;

        displayPolicy.addWindowLw(mNavBarWindow, attrs);
@@ -466,10 +467,6 @@ public class DisplayPolicyTests extends WindowTestsBase { 
    @Test

    public void testImeInsetsGivenContentFrame() {

        final DisplayPolicy displayPolicy = mDisplayContent.getDisplayPolicy();

        final DisplayInfo displayInfo = new DisplayInfo();

        displayInfo.logicalWidth = 1000;

        displayInfo.logicalHeight = 2000;

        displayInfo.rotation = ROTATION_0;



        mDisplayContent.setInputMethodWindowLocked(mImeWindow);

        mImeWindow.getControllableInsetProvider().setServerVisible(true);