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

Merge "Use correct gravity for 3-button gesture insets" into udc-dev

Browse Source
This commit is contained in:
Yunfan Chen
2023-03-31 07:19:49 +00:00
committed by Android (Google) Code Review
parent c3d2c2e58d 292094e873
commit c3550fca47
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
View File

@@ -1732,6 +1732,11 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
final int gestureHeight = userContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.navigation_bar_gesture_height);
final boolean handlingGesture = mEdgeBackGestureHandler.isHandlingGestures();
final InsetsFrameProvider mandatoryGestureProvider = new InsetsFrameProvider(
mInsetsSourceOwner, 0, WindowInsets.Type.mandatorySystemGestures());
if (handlingGesture) {
mandatoryGestureProvider.setInsetsSize(Insets.of(0, 0, 0, gestureHeight));
}
final int gestureInsetsLeft = handlingGesture
? mEdgeBackGestureHandler.getEdgeWidthLeft() + safeInsetsLeft : 0;
final int gestureInsetsRight = handlingGesture
@@ -1739,9 +1744,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
return new InsetsFrameProvider[] {
navBarProvider,
tappableElementProvider,
new InsetsFrameProvider(
mInsetsSourceOwner, 0, WindowInsets.Type.mandatorySystemGestures())
.setInsetsSize(Insets.of(0, 0, 0, gestureHeight)),
mandatoryGestureProvider,
new InsetsFrameProvider(mInsetsSourceOwner, 0, WindowInsets.Type.systemGestures())
.setSource(InsetsFrameProvider.SOURCE_DISPLAY)
.setInsetsSize(Insets.of(gestureInsetsLeft, 0, 0, 0)),