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

Commit ce2de700 authored by Shawn Lin's avatar Shawn Lin Committed by Android (Google) Code Review
Browse files

Merge "Fix incorrect system gesture insets reported when there are cutout... 

Merge "Fix incorrect system gesture insets reported when there are cutout areas on the left/right edges of the display"
parents 2784968e b8feac12

services/core/java/com/android/server/wm/DisplayPolicy.java

+7 −3
Original line number Diff line number Diff line
@@ -1153,15 +1153,19 @@ public class DisplayPolicy { 
                        });

                mDisplayContent.setInsetProvider(ITYPE_LEFT_GESTURES, win,

                        (displayFrames, windowState, inOutFrame) -> {

                            final int leftSafeInset =

                                    Math.max(displayFrames.mDisplayCutoutSafe.left, 0);

                            inOutFrame.left = 0;

                            inOutFrame.top = 0;

                            inOutFrame.bottom = displayFrames.mDisplayHeight;

                            inOutFrame.right = displayFrames.mUnrestricted.left + mLeftGestureInset;

                            inOutFrame.right = leftSafeInset + mLeftGestureInset;

                        });

                mDisplayContent.setInsetProvider(ITYPE_RIGHT_GESTURES, win,

                        (displayFrames, windowState, inOutFrame) -> {

                            inOutFrame.left = displayFrames.mUnrestricted.right

                                    - mRightGestureInset;

                            final int rightSafeInset =

                                    Math.min(displayFrames.mDisplayCutoutSafe.right,

                                            displayFrames.mUnrestricted.right);

                            inOutFrame.left = rightSafeInset - mRightGestureInset;

                            inOutFrame.top = 0;

                            inOutFrame.bottom = displayFrames.mDisplayHeight;

                            inOutFrame.right = displayFrames.mDisplayWidth;