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

Commit 6fdacef0 authored by Yunfan Chen's avatar Yunfan Chen Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Force extra nav bar provide side gesture insets am: a2e8e229 am: 12bd8024 

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



Change-Id: If2fd775b870ae47b56aafc83926b379101fc6db4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28e5984b 12bd8024

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

+23 −0
Original line number Original line Diff line number Diff line
@@ -1231,6 +1231,29 @@ public class DisplayPolicy { 
                                    }

                                    }

                                    inOutFrame.inset(win.mGivenContentInsets);

                                    inOutFrame.inset(win.mGivenContentInsets);

                                } : null, imeFrameProvider);

                                } : null, imeFrameProvider);

                        if (mNavigationBar == null && (insetsType == ITYPE_NAVIGATION_BAR

                                || insetsType == ITYPE_EXTRA_NAVIGATION_BAR)) {

                            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 =

                                                leftSafeInset + mLeftGestureInset;

                                    });

                            mDisplayContent.setInsetProvider(ITYPE_RIGHT_GESTURES, win,

                                    (displayFrames, windowState, inOutFrame) -> {

                                        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;

                                    });

                        }

                        mInsetsSourceWindowsExceptIme.add(win);

                        mInsetsSourceWindowsExceptIme.add(win);

                    }

                    }

                }

                }