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

Merge "PiP: Allow customization of PiP minimum size." into sc-dev

Browse Source
This commit is contained in:
Ben Lin
2021-07-20 20:35:36 +00:00
committed by Android (Google) Code Review
parent 640f3d9c0d f75fffdc20
commit c312c6481b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/WindowManager/Shell/res/values/config.xml
View File

@@ -36,6 +36,9 @@
<!-- Allow PIP to resize via dragging the corner of PiP. --> <!-- Allow PIP to resize via dragging the corner of PiP. -->
<bool name="config_pipEnableDragCornerResize">false</bool> <bool name="config_pipEnableDragCornerResize">false</bool>
<!-- PiP minimum size, which is a % based off the shorter side of display width and height -->
<fraction name="config_pipShortestEdgePercent">40%</fraction>
<!-- Animation duration when using long press on recents to dock --> <!-- Animation duration when using long press on recents to dock -->
<integer name="long_press_dock_anim_duration">250</integer> <integer name="long_press_dock_anim_duration">250</integer>

7
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java
View File

@@ -63,7 +63,6 @@ import java.io.PrintWriter;
* the PIP. * the PIP.
*/ */
public class PipTouchHandler { public class PipTouchHandler {
@VisibleForTesting static final float MINIMUM_SIZE_PERCENT = 0.4f;
private static final String TAG = "PipTouchHandler"; private static final String TAG = "PipTouchHandler";
private static final float DEFAULT_STASH_VELOCITY_THRESHOLD = 18000.f; private static final float DEFAULT_STASH_VELOCITY_THRESHOLD = 18000.f;
@@ -115,6 +114,7 @@ public class PipTouchHandler {
private float mSavedSnapFraction = -1f; private float mSavedSnapFraction = -1f;
private boolean mSendingHoverAccessibilityEvents; private boolean mSendingHoverAccessibilityEvents;
private boolean mMovementWithinDismiss; private boolean mMovementWithinDismiss;
private float mMinimumSizePercent;
// Touch state // Touch state
private final PipTouchState mTouchState; private final PipTouchState mTouchState;
@@ -252,6 +252,7 @@ public class PipTouchHandler {
mExpandedShortestEdgeSize = res.getDimensionPixelSize( mExpandedShortestEdgeSize = res.getDimensionPixelSize(
R.dimen.pip_expanded_shortest_edge_size); R.dimen.pip_expanded_shortest_edge_size);
mImeOffset = res.getDimensionPixelSize(R.dimen.pip_ime_offset); mImeOffset = res.getDimensionPixelSize(R.dimen.pip_ime_offset);
mMinimumSizePercent = res.getFraction(R.fraction.config_pipShortestEdgePercent, 1, 1);
mPipDismissTargetHandler.updateMagneticTargetSize(); mPipDismissTargetHandler.updateMagneticTargetSize();
} }
@@ -481,12 +482,12 @@ public class PipTouchHandler {
+ (mPipBoundsState.getDisplayBounds().height() - insetBounds.bottom); + (mPipBoundsState.getDisplayBounds().height() - insetBounds.bottom);
final int minWidth, minHeight, maxWidth, maxHeight; final int minWidth, minHeight, maxWidth, maxHeight;
if (aspectRatio > 1f) { if (aspectRatio > 1f) {
minWidth = (int) Math.min(normalBounds.width(), shorterLength * MINIMUM_SIZE_PERCENT); minWidth = (int) Math.min(normalBounds.width(), shorterLength * mMinimumSizePercent);
minHeight = (int) (minWidth / aspectRatio); minHeight = (int) (minWidth / aspectRatio);
maxWidth = (int) Math.max(normalBounds.width(), shorterLength - totalHorizontalPadding); maxWidth = (int) Math.max(normalBounds.width(), shorterLength - totalHorizontalPadding);
maxHeight = (int) (maxWidth / aspectRatio); maxHeight = (int) (maxWidth / aspectRatio);
} else { } else {
minHeight = (int) Math.min(normalBounds.height(), shorterLength * MINIMUM_SIZE_PERCENT); minHeight = (int) Math.min(normalBounds.height(), shorterLength * mMinimumSizePercent);
minWidth = (int) (minHeight * aspectRatio); minWidth = (int) (minHeight * aspectRatio);
maxHeight = (int) Math.max(normalBounds.height(), shorterLength - totalVerticalPadding); maxHeight = (int) Math.max(normalBounds.height(), shorterLength - totalVerticalPadding);
maxWidth = (int) (maxHeight * aspectRatio); maxWidth = (int) (maxHeight * aspectRatio);