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

Merge "Fix ResolverDrawerLayout child measurement" into tm-dev

Browse Source
This commit is contained in:
Matt Casey
2022-06-01 19:03:44 +00:00
committed by Android (Google) Code Review
parent bd35c8dabf c91318ace9
commit a834a9bd52
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/widget/ResolverDrawerLayout.java
View File

@@ -929,7 +929,7 @@ public class ResolverDrawerLayout extends ViewGroup {
// Single-use layout; just ignore the mode and use available space. // Single-use layout; just ignore the mode and use available space.
// Clamp to maxWidth. // Clamp to maxWidth.
if (mMaxWidth >= 0) { if (mMaxWidth >= 0) {
widthSize = Math.min(widthSize, mMaxWidth); widthSize = Math.min(widthSize, mMaxWidth + getPaddingLeft() + getPaddingRight());
} }
final int widthSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY); final int widthSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY);
@@ -1008,8 +1008,9 @@ public class ResolverDrawerLayout extends ViewGroup {
View indicatorHost = null; View indicatorHost = null;
int ypos = mTopOffset; int ypos = mTopOffset;
int leftEdge = getPaddingLeft(); final int leftEdge = getPaddingLeft();
int rightEdge = width - getPaddingRight(); final int rightEdge = width - getPaddingRight();
final int widthAvailable = rightEdge - leftEdge;
final int childCount = getChildCount(); final int childCount = getChildCount();
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
@@ -1030,7 +1031,6 @@ public class ResolverDrawerLayout extends ViewGroup {
final int bottom = top + child.getMeasuredHeight(); final int bottom = top + child.getMeasuredHeight();
final int childWidth = child.getMeasuredWidth(); final int childWidth = child.getMeasuredWidth();
final int widthAvailable = rightEdge - leftEdge;
final int left = leftEdge + (widthAvailable - childWidth) / 2; final int left = leftEdge + (widthAvailable - childWidth) / 2;
final int right = left + childWidth; final int right = left + childWidth;