Merge changes from topic "presubmit-am-1f589f278e0b4cd4bdc898353c994c9d" into tm-mainline-prod am: 941cfd7d2f

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

Change-Id: Icb2492c9bbeb41b68393f17e1750e2c628e0ee34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-07 05:11:21 +00:00
committed by Automerger Merge Worker

View File

@@ -151,6 +151,8 @@ final class NavigationBarController {
private boolean mDrawLegacyNavigationBarBackground;
private final Rect mTempRect = new Rect();
Impl(@NonNull InputMethodService inputMethodService) {
mService = inputMethodService;
}
@@ -281,13 +283,12 @@ final class NavigationBarController {
touchableRegion.set(originalInsets.touchableRegion);
break;
}
final Rect navBarRect = new Rect(decor.getLeft(),
decor.getBottom() - systemInsets.bottom,
mTempRect.set(decor.getLeft(), decor.getBottom() - systemInsets.bottom,
decor.getRight(), decor.getBottom());
if (touchableRegion == null) {
touchableRegion = new Region(navBarRect);
touchableRegion = new Region(mTempRect);
} else {
touchableRegion.union(navBarRect);
touchableRegion.union(mTempRect);
}
dest.touchableRegion.set(touchableRegion);