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

Merge "Fix width of GA popup menu." into rvc-dev am: c4452824a0 am: b1809e1c32

Browse Source 
Change-Id: I8f9fb8863927a8398b51c75814aee5209f8f593a
This commit is contained in:
Fabian Kozynski
2020-05-21 16:22:41 +00:00
committed by Automerger Merge Worker
parent bb03656f5b b1809e1c32
commit 542fe5e469
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java
View File

@@ -89,15 +89,19 @@ public class GlobalActionsPopupMenu extends ListPopupWindow {
// width should be between [.5, .9] of screen // width should be between [.5, .9] of screen
int parentWidth = res.getSystem().getDisplayMetrics().widthPixels; int parentWidth = res.getSystem().getDisplayMetrics().widthPixels;
int widthSpec = MeasureSpec.makeMeasureSpec( int widthSpec = MeasureSpec.makeMeasureSpec(
(int) (parentWidth * 0.9), MeasureSpec.AT_MOST); (int) (parentWidth * 0.9) - 2 * mMenuHorizontalPadding, MeasureSpec.AT_MOST);
View child = mAdapter.getView(0, null, listView); int maxWidth = 0;
child.measure(widthSpec, MeasureSpec.UNSPECIFIED); for (int i = 0; i < mAdapter.getCount(); i++) {
int width = Math.max(child.getMeasuredWidth(), (int) (parentWidth * 0.5)); View child = mAdapter.getView(i, null, listView);
child.measure(widthSpec, MeasureSpec.UNSPECIFIED);
int w = child.getMeasuredWidth();
maxWidth = Math.max(w, maxWidth);
}
int width = Math.max(maxWidth, (int) (parentWidth * 0.5) - 2 * mMenuHorizontalPadding);
listView.setPadding(mMenuHorizontalPadding, mMenuVerticalPadding, listView.setPadding(mMenuHorizontalPadding, mMenuVerticalPadding,
mMenuHorizontalPadding, mMenuVerticalPadding); mMenuHorizontalPadding, mMenuVerticalPadding);
setWidth(width); setWidth(width + 2 * mMenuHorizontalPadding);
setHorizontalOffset(getAnchorView().getWidth() - mGlobalActionsSidePadding - width); setHorizontalOffset(getAnchorView().getWidth() - mGlobalActionsSidePadding - width);
} }