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

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

Change-Id: Ia7a5698225826f7c0c16c5820935ec63cf04a5ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-02 11:46:47 +00:00
committed by Automerger Merge Worker
parent be8a086c7c 64c27756ba
commit 3bb09cb322
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
View File

@@ -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)) {