Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5369328b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: If876af5296330c1de14753e4dfc1ca4540cf2468
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb50417b 64c27756

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

+6 −3
Original line number Original line Diff line number Diff line
@@ -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");