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

Merge "Adjust the estimated minimum size of PiP menu" into sc-dev

Browse Source
This commit is contained in:
Hongwei Wang
2021-02-02 17:30:24 +00:00
committed by Android (Google) Code Review
parent 4f3e949354 0dc09244e5
commit b7361f8dda
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java
View File

@@ -212,8 +212,8 @@ public class PhonePipMenuController implements PipMenuController {
}
@Nullable
Size getEstimatedMenuSize() {
return mPipMenuView == null ? null : mPipMenuView.getEstimatedMenuSize();
Size getEstimatedMinMenuSize() {
return mPipMenuView == null ? null : mPipMenuView.getEstimatedMinMenuSize();
}
/**

18
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
View File

@@ -367,15 +367,17 @@ public class PipMenuView extends FrameLayout {
}
/**
* @return estimated {@link Size} for which the width is based on number of actions and
* height based on the height of expand button + top and bottom action bar.
* @return Estimated minimum {@link Size} to hold the actions.
* See also {@link #updateActionViews(Rect)}
*/
Size getEstimatedMenuSize() {
final int pipActionSize = mContext.getResources().getDimensionPixelSize(
R.dimen.pip_action_size);
final int width = mActions.size() * pipActionSize;
final int height = pipActionSize * 2 + mContext.getResources().getDimensionPixelSize(
R.dimen.pip_expand_action_size);
Size getEstimatedMinMenuSize() {
final int pipActionSize = getResources().getDimensionPixelSize(R.dimen.pip_action_size);
// the minimum width would be (2 * pipActionSize) since we have settings and dismiss button
// on the top action container.
final int width = Math.max(2, mActions.size()) * pipActionSize;
final int height = getResources().getDimensionPixelSize(R.dimen.pip_expand_action_size)
+ getResources().getDimensionPixelSize(R.dimen.pip_action_padding)
+ getResources().getDimensionPixelSize(R.dimen.pip_expand_container_edge_margin);
return new Size(width, height);
}

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

@@ -931,14 +931,14 @@ public class PipTouchHandler {
if (!mEnableResize) {
return false;
}
final Size estimatedMenuSize = mMenuController.getEstimatedMenuSize();
if (estimatedMenuSize == null) {
final Size estimatedMinMenuSize = mMenuController.getEstimatedMinMenuSize();
if (estimatedMinMenuSize == null) {
Log.wtf(TAG, "Failed to get estimated menu size");
return false;
}
final Rect currentBounds = mPipBoundsState.getBounds();
return currentBounds.width() < estimatedMenuSize.getWidth()
|| currentBounds.height() < estimatedMenuSize.getHeight();
return currentBounds.width() < estimatedMinMenuSize.getWidth()
|| currentBounds.height() < estimatedMinMenuSize.getHeight();
}
/**