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

Merge "Get the navigation bar insets frame from the window"

Browse Source
This commit is contained in:
Tiger Huang
2023-02-07 14:27:09 +00:00
committed by Android (Google) Code Review
parent 96a43d6415 8bf92fd261
commit c7f6a80cbe
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/wm/AccessibilityController.java
View File

@@ -994,7 +994,7 @@ final class AccessibilityController {
// navigation bar insets into nonMagnifiedBounds. It happens when
// navigation mode is gestural.
if (isUntouchableNavigationBar(windowState, mTempRegion3)) {
final Rect navBarInsets = getNavBarInsets(mDisplayContent);
final Rect navBarInsets = getSystemBarInsetsFrame(windowState);
nonMagnifiedBounds.op(navBarInsets, Region.Op.UNION);
availableBounds.op(navBarInsets, Region.Op.DIFFERENCE);
}
@@ -1459,10 +1459,12 @@ final class AccessibilityController {
return touchableRegion.isEmpty();
}
static Rect getNavBarInsets(DisplayContent displayContent) {
final InsetsSource source = displayContent.getInsetsStateController().getRawInsetsState()
.peekSource(ITYPE_NAVIGATION_BAR);
return source != null ? source.getFrame() : EMPTY_RECT;
static Rect getSystemBarInsetsFrame(WindowState win) {
if (win == null) {
return EMPTY_RECT;
}
final InsetsSourceProvider provider = win.getControllableInsetProvider();
return provider != null ? provider.getSource().getFrame() : EMPTY_RECT;
}
/**
@@ -1615,7 +1617,10 @@ final class AccessibilityController {
// region of navigation bar inset because all touch events from this region
// would be received by launcher, i.e. this region is a un-touchable one
// for the application.
unaccountedSpace.op(getNavBarInsets(dc), unaccountedSpace,
unaccountedSpace.op(
getSystemBarInsetsFrame(
mService.mWindowMap.get(a11yWindow.getWindowInfo().token)),
unaccountedSpace,
Region.Op.REVERSE_DIFFERENCE);
}