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

Merge "Do not set different gravity for non-moveable nav bar" into udc-dev am: 64c27756ba am: 5369328b06

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

Change-Id: Iee4ebbb2be2880445ffa28e004065c33b99d56be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-02 14:41:57 +00:00
committed by Automerger Merge Worker
parent 1688984632 5369328b06
commit bed289c7f1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
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");