diff options
| author | 2023-06-07 18:01:22 +0000 | |
|---|---|---|
| committer | 2023-06-07 18:01:22 +0000 | |
| commit | 308dfc60a71c9cf211036efa719476a5cf54bda2 (patch) | |
| tree | 0d01b7c69b44069d54a32f4114e7f6dcb0980dae | |
| parent | a67d5db8eed614dc5542e04ed750196975f2681d (diff) | |
| parent | 297cb2b23c5fb6c68ef44b6abe58d2ef7c11fbb5 (diff) | |
Merge "Only compare the relevant insets for navbar position" into udc-dev am: 50e70288ee am: 297cb2b23c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23578111
Change-Id: If94b67e9ee33a197ce6b35e454daad578a460e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java index d6e1a82a68ff..467e9c7a116b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java @@ -375,16 +375,15 @@ public class DisplayLayout { insetsState.getDisplayFrame(), WindowInsets.Type.navigationBars(), false /* ignoreVisibility */); - outInsets.set(insets.left, insets.top, insets.right, insets.bottom); int position = navigationBarPosition(res, displayWidth, displayHeight, displayRotation); int navBarSize = getNavigationBarSize(res, position, displayWidth > displayHeight, uiMode); if (position == NAV_BAR_BOTTOM) { - outInsets.bottom = Math.max(outInsets.bottom , navBarSize); + outInsets.bottom = Math.max(insets.bottom , navBarSize); } else if (position == NAV_BAR_RIGHT) { - outInsets.right = Math.max(outInsets.right , navBarSize); + outInsets.right = Math.max(insets.right , navBarSize); } else if (position == NAV_BAR_LEFT) { - outInsets.left = Math.max(outInsets.left , navBarSize); + outInsets.left = Math.max(insets.left , navBarSize); } } |