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

Commit 1950c2b3 authored by Cosmin Băieș's avatar Cosmin Băieș
Browse files

Set IME nav bar height when installing unattached 

When installing the IME navigation bar height the systemInsets can be
null if the DecorView is not attached to the window yet. In this case we
still add the NavigationBarFrame to the DecorView, with the default
LayoutParams, which resolve the height to MATCH_PARENT. Since ensuring
the IME insets contain at least the IME navigation bar in [1], this
could lead to full size IME insets for a few frames.

This sets the initial IME navigation bar height to the captionBarHeight
when the DecorView is not attached yet.

  [1]: Id252731ac8b5138cccd1164197ff3ece3a5f3cf8

Flag: EXEMPT bugfix
Bug: 401192777
Bug: 387924046
Test: atest WindowInsetsControllerTests#testDispatchApplyWindowInsetsCount_ime
  WindowInsetsControllerTests#testImeInsetsFinalSizeIsMaximumSize
  InputMethodServiceTest#testImeNavigationBarInsets
Change-Id: Icd174e9dd64b33804bedfcc6cdf0ddf90e29fecd
parent 4a2e7e3a

core/java/android/inputmethodservice/NavigationBarController.java

+7 −2
Original line number Diff line number Diff line
@@ -236,7 +236,12 @@ final class NavigationBarController { 
                            systemInsets.bottom, Gravity.BOTTOM));

                    mLastInsets = systemInsets;

                } else {

                    decorView.addView(mNavigationBarFrame);

                    // If systemInsets are null, the DecorView is not attached to the window yet.

                    // Use the final captionBar height as the initial one, otherwise it resolves to

                    // match parent, and can lead to full size IME insets.

                    final int height = getImeCaptionBarHeight(true /* imeDrawsImeNavBar */);

                    decorView.addView(mNavigationBarFrame, new FrameLayout.LayoutParams(

                            ViewGroup.LayoutParams.MATCH_PARENT, height, Gravity.BOTTOM));

                }

                final NavigationBarView navigationBarView = mNavigationBarFrame.findViewByPredicate(

                        NavigationBarView.class::isInstance);
@@ -461,7 +466,7 @@ final class NavigationBarController { 
            final Insets systemInsets = getSystemInsets();

            if (systemInsets != null) {

                if (!Objects.equals(systemInsets, mLastInsets)) {

                    mNavigationBarFrame.setLayoutParams(new NavigationBarFrame.LayoutParams(

                    mNavigationBarFrame.setLayoutParams(new FrameLayout.LayoutParams(

                            ViewGroup.LayoutParams.MATCH_PARENT,

                            systemInsets.bottom, Gravity.BOTTOM));

                    mLastInsets = systemInsets;