Merge "[DO NOT MERGE] Force extra nav bar provide side gesture insets" into tm-dev

This commit is contained in:
Yunfan Chen
2022-05-19 12:10:57 +00:00
committed by Android (Google) Code Review

View File

@@ -1231,6 +1231,29 @@ public class DisplayPolicy {
} }
inOutFrame.inset(win.mGivenContentInsets); inOutFrame.inset(win.mGivenContentInsets);
} : null, imeFrameProvider); } : null, imeFrameProvider);
if (mNavigationBar == null && (insetsType == ITYPE_NAVIGATION_BAR
|| insetsType == ITYPE_EXTRA_NAVIGATION_BAR)) {
mDisplayContent.setInsetProvider(ITYPE_LEFT_GESTURES, win,
(displayFrames, windowState, inOutFrame) -> {
final int leftSafeInset =
Math.max(displayFrames.mDisplayCutoutSafe.left,0);
inOutFrame.left = 0;
inOutFrame.top = 0;
inOutFrame.bottom = displayFrames.mDisplayHeight;
inOutFrame.right =
leftSafeInset + mLeftGestureInset;
});
mDisplayContent.setInsetProvider(ITYPE_RIGHT_GESTURES, win,
(displayFrames, windowState, inOutFrame) -> {
final int rightSafeInset =
Math.min(displayFrames.mDisplayCutoutSafe.right,
displayFrames.mUnrestricted.right);
inOutFrame.left = rightSafeInset - mRightGestureInset;
inOutFrame.top = 0;
inOutFrame.bottom = displayFrames.mDisplayHeight;
inOutFrame.right = displayFrames.mDisplayWidth;
});
}
mInsetsSourceWindowsExceptIme.add(win); mInsetsSourceWindowsExceptIme.add(win);
} }
} }