Merge "Do not set different gravity for non-moveable nav bar" into udc-dev

This commit is contained in:
Treehugger Robot
2023-05-02 09:40:27 +00:00
committed by Android (Google) Code Review

View File

@@ -359,11 +359,14 @@ class WindowTestsBase extends SystemServiceTestsBase {
new InsetsFrameProvider(owner, 0, WindowInsets.Type.tappableElement()), new InsetsFrameProvider(owner, 0, WindowInsets.Type.tappableElement()),
new InsetsFrameProvider(owner, 0, WindowInsets.Type.mandatorySystemGestures()) new InsetsFrameProvider(owner, 0, WindowInsets.Type.mandatorySystemGestures())
}; };
// If the navigation bar cannot move then it is always at the bottom.
if (mDisplayContent.getDisplayPolicy().navigationBarCanMove()) {
for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) { for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) {
mNavBarWindow.mAttrs.paramsForRotation[rot] = mNavBarWindow.mAttrs.paramsForRotation[rot] =
getNavBarLayoutParamsForRotation(rot, owner); getNavBarLayoutParamsForRotation(rot, owner);
} }
} }
}
if (addAll || ArrayUtils.contains(requestedWindows, W_DOCK_DIVIDER)) { if (addAll || ArrayUtils.contains(requestedWindows, W_DOCK_DIVIDER)) {
mDockedDividerWindow = createCommonWindow(null, TYPE_DOCK_DIVIDER, mDockedDividerWindow = createCommonWindow(null, TYPE_DOCK_DIVIDER,
"mDockedDividerWindow"); "mDockedDividerWindow");