Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I9d087f60cd3244b763812895e33d110db8e559fc
This commit is contained in:
Tiger Huang
2020-11-18 06:17:24 +00:00
committed by Automerger Merge Worker
parent 149c95c766 edf2036691
commit 4b1cbf3844
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/inputmethodservice/InputMethodService.java
View File

@@ -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

18
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -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);