diff options
| author | 2021-04-01 17:39:34 -0700 | |
|---|---|---|
| committer | 2021-04-02 10:21:00 -0700 | |
| commit | 8d5b4fa9bf4f074e7bbeed29dee351bb44b49d39 (patch) | |
| tree | b62cb69933a7b3f36b306c9d589442defe217463 | |
| parent | 41d65a1ba0a7f2696278607b52f310f4d021949d (diff) | |
PiP: Disable corner resizing.
This is done by disabling all the trigger points (the 4 corners). Will
hold off on removing the entire code until later in case needed.
Bug: 179299163
Test: Manual. Dragging from the corner no longer works
Change-Id: I4ed931245cbb49647feeff8b37174f6502fe9c5e
| -rw-r--r-- | libs/WindowManager/Shell/res/values/config.xml | 3 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/res/values/config.xml b/libs/WindowManager/Shell/res/values/config.xml index 0e783779866e..6698a01dc159 100644 --- a/libs/WindowManager/Shell/res/values/config.xml +++ b/libs/WindowManager/Shell/res/values/config.xml @@ -30,6 +30,9 @@ <!-- Allow PIP to resize to a slightly bigger state upon touch/showing the menu --> <bool name="config_pipEnableResizeForMenu">true</bool> + <!-- Allow PIP to resize via dragging the corner of PiP. --> + <bool name="config_pipEnableDragCornerResize">false</bool> + <!-- Allow PIP to enable round corner, see also R.dimen.pip_corner_radius --> <bool name="config_pipEnableRoundCorner">false</bool> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java index 588571f7171e..0a148c413c0f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java @@ -103,6 +103,7 @@ public class PipResizeGestureHandler { private boolean mIsAttached; private boolean mIsEnabled; private boolean mEnablePinchResize; + private boolean mEnableDragCornerResize; private boolean mIsSysUiStateValid; private boolean mThresholdCrossed; private boolean mOngoingPinchToResize = false; @@ -174,6 +175,7 @@ public class PipResizeGestureHandler { private void reloadResources() { final Resources res = mContext.getResources(); mDelta = res.getDimensionPixelSize(R.dimen.pip_resize_edge_size); + mEnableDragCornerResize = res.getBoolean(R.bool.config_pipEnableDragCornerResize); mTouchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop(); } @@ -267,6 +269,10 @@ public class PipResizeGestureHandler { * |_|_| |_|_| */ public boolean isWithinDragResizeRegion(int x, int y) { + if (!mEnableDragCornerResize) { + return false; + } + final Rect currentPipBounds = mPipBoundsState.getBounds(); if (currentPipBounds == null) { return false; |