Merge "Do not set different gravity for non-moveable nav bar" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
64c27756ba
@@ -359,9 +359,12 @@ 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())
|
||||||
};
|
};
|
||||||
for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) {
|
// If the navigation bar cannot move then it is always at the bottom.
|
||||||
mNavBarWindow.mAttrs.paramsForRotation[rot] =
|
if (mDisplayContent.getDisplayPolicy().navigationBarCanMove()) {
|
||||||
getNavBarLayoutParamsForRotation(rot, owner);
|
for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) {
|
||||||
|
mNavBarWindow.mAttrs.paramsForRotation[rot] =
|
||||||
|
getNavBarLayoutParamsForRotation(rot, owner);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (addAll || ArrayUtils.contains(requestedWindows, W_DOCK_DIVIDER)) {
|
if (addAll || ArrayUtils.contains(requestedWindows, W_DOCK_DIVIDER)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user