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

Commit edf20366 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Do let IME fit invisible insets" into rvc-qpr-dev

parents 22ac0c0b 604b2843

core/java/android/inputmethodservice/InputMethodService.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -1215,7 +1215,6 @@ public class InputMethodService extends AbstractInputMethodService { 
                WindowManager.LayoutParams.TYPE_INPUT_METHOD, Gravity.BOTTOM, false);

                WindowManager.LayoutParams.TYPE_INPUT_METHOD, Gravity.BOTTOM, false);

        mWindow.getWindow().getAttributes().setFitInsetsTypes(statusBars() | navigationBars());

        mWindow.getWindow().getAttributes().setFitInsetsTypes(statusBars() | navigationBars());

        mWindow.getWindow().getAttributes().setFitInsetsSides(Side.all() & ~Side.BOTTOM);

        mWindow.getWindow().getAttributes().setFitInsetsSides(Side.all() & ~Side.BOTTOM);

        mWindow.getWindow().getAttributes().setFitInsetsIgnoringVisibility(true);





        // IME layout should always be inset by navigation bar, no matter its current visibility,

        // IME layout should always be inset by navigation bar, no matter its current visibility,

        // unless automotive requests it. Automotive devices may request the navigation bar to be

        // unless automotive requests it. Automotive devices may request the navigation bar to be

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

+8 −10
Original line number Original line Diff line number Diff line
@@ -549,11 +549,10 @@ public class DisplayPolicy { 
                        synchronized (mLock) {

                        synchronized (mLock) {

                            mDisplayContent.calculateSystemGestureExclusion(

                            mDisplayContent.calculateSystemGestureExclusion(

                                    excludedRegion, null /* outUnrestricted */);

                                    excludedRegion, null /* outUnrestricted */);

                            final boolean sideAllowed = mNavigationBarAlwaysShowOnSideGesture

                            final boolean excluded =

                                    || mNavigationBarPosition == NAV_BAR_RIGHT;

                                    mSystemGestures.currentGestureStartedInRegion(excludedRegion);

                            if (mNavigationBar != null && sideAllowed

                            if (mNavigationBar != null && (mNavigationBarPosition == NAV_BAR_RIGHT

                                    && !mSystemGestures.currentGestureStartedInRegion(

                                    || !excluded && mNavigationBarAlwaysShowOnSideGesture)) {

                                            excludedRegion)) {

                                requestTransientBars(mNavigationBar);

                                requestTransientBars(mNavigationBar);

                            }

                            }

                            checkAltBarSwipeForTransientBars(ALT_BAR_RIGHT);

                            checkAltBarSwipeForTransientBars(ALT_BAR_RIGHT);
@@ -567,11 +566,10 @@ public class DisplayPolicy { 
                        synchronized (mLock) {

                        synchronized (mLock) {

                            mDisplayContent.calculateSystemGestureExclusion(

                            mDisplayContent.calculateSystemGestureExclusion(

                                    excludedRegion, null /* outUnrestricted */);

                                    excludedRegion, null /* outUnrestricted */);

                            final boolean sideAllowed = mNavigationBarAlwaysShowOnSideGesture

                            final boolean excluded =

                                    || mNavigationBarPosition == NAV_BAR_LEFT;

                                    mSystemGestures.currentGestureStartedInRegion(excludedRegion);

                            if (mNavigationBar != null && sideAllowed

                            if (mNavigationBar != null && (mNavigationBarPosition == NAV_BAR_LEFT

                                    && !mSystemGestures.currentGestureStartedInRegion(

                                    || !excluded && mNavigationBarAlwaysShowOnSideGesture)) {

                                            excludedRegion)) {

                                requestTransientBars(mNavigationBar);

                                requestTransientBars(mNavigationBar);

                            }

                            }

                            checkAltBarSwipeForTransientBars(ALT_BAR_LEFT);

                            checkAltBarSwipeForTransientBars(ALT_BAR_LEFT);