diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-22 21:07:27 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-22 21:07:27 +0000 |
| commit | 730f2e8ea1589d133876f08529c43d0727a67c3c (patch) | |
| tree | 8f61f28994029a4d1c22abebb56ca5bfd1b781ed | |
| parent | b1586e8e874cc5ce0abeb9f072a941c87a2c7c3a (diff) | |
| parent | fa9bbed9467ca84fada4752d94f403bcfd163b3b (diff) | |
| download | base-730f2e8ea1589d133876f08529c43d0727a67c3c.tar.gz | |
Merge cherrypicks of [17800234] into sc-qpr3-release.
Change-Id: I4bae0639b4dc3948f50aa794f00285ffb1b5604b
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayPolicy.java | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index d54a388245f5..b64be7ce9e94 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -188,6 +188,7 @@ public class DisplayPolicy { private static final String TAG = TAG_WITH_CLASS_NAME ? "DisplayPolicy" : TAG_WM; private static final boolean ALTERNATE_CAR_MODE_NAV_SIZE = false; + private static final boolean LEGACY_TASKBAR_GESTURE_INSETS = false; // The panic gesture may become active only after the keyguard is dismissed and the immersive // app shows again. If that doesn't happen for 30s we drop the gesture. @@ -1275,6 +1276,35 @@ public class DisplayPolicy { if (!INSETS_LAYOUT_GENERALIZATION) { mDisplayContent.setInsetProvider(insetsType, win, null, imeFrameProvider); + if (LEGACY_TASKBAR_GESTURE_INSETS) { + 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; + }); + } + } } else { mDisplayContent.setInsetProvider(insetsType, win, (displayFrames, windowState, inOutFrame) -> inOutFrame.inset( |