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

Only compare the relevant insets for navbar position

Browse Source 
This reverts a regression introduced in http://ag/21397084, where the
insets were all rewritten to outInsets, even though the insetsState
for them when rotating screen is still in previous orientation.

Bug: 281769053
Bug: 234093736
Test: http://recall/-/ekEuGtt9d9HWqkUtAzpHx8/eNX1aOBLtPs7PUR5LUuYfi
Change-Id: I508123660c33e63696af39c2735a1dc92fdaf74f
This commit is contained in:
Mateusz Cicheński
2023-06-06 04:04:09 +00:00
parent 94e4aeef46
commit 5bd7cc2211
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java
View File

@@ -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);
}
}