diff options
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 3f7a07bbd31a..0555cd403b00 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -350,24 +350,24 @@ public class ScrollView extends FrameLayout { if (getChildCount() > 0) { final View child = getChildAt(0); - final int height = getMeasuredHeight(); - if (child.getMeasuredHeight() < height) { - final int widthPadding; - final int heightPadding; - final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams(); - final int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion; - if (targetSdkVersion >= VERSION_CODES.M) { - widthPadding = mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin; - heightPadding = mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin; - } else { - widthPadding = mPaddingLeft + mPaddingRight; - heightPadding = mPaddingTop + mPaddingBottom; - } + final int widthPadding; + final int heightPadding; + final int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion; + final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams(); + if (targetSdkVersion >= VERSION_CODES.M) { + widthPadding = mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin; + heightPadding = mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin; + } else { + widthPadding = mPaddingLeft + mPaddingRight; + heightPadding = mPaddingTop + mPaddingBottom; + } + final int desiredHeight = getMeasuredHeight() - heightPadding; + if (child.getMeasuredHeight() < desiredHeight) { final int childWidthMeasureSpec = getChildMeasureSpec( widthMeasureSpec, widthPadding, lp.width); final int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec( - height - heightPadding, MeasureSpec.EXACTLY); + desiredHeight, MeasureSpec.EXACTLY); child.measure(childWidthMeasureSpec, childHeightMeasureSpec); } } @@ -1268,9 +1268,10 @@ public class ScrollView extends FrameLayout { childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec, mPaddingLeft + mPaddingRight, lp.width); - + final int verticalPadding = mPaddingTop + mPaddingBottom; childHeightMeasureSpec = MeasureSpec.makeSafeMeasureSpec( - MeasureSpec.getSize(parentHeightMeasureSpec), MeasureSpec.UNSPECIFIED); + Math.max(0, MeasureSpec.getSize(parentHeightMeasureSpec) - verticalPadding), + MeasureSpec.UNSPECIFIED); child.measure(childWidthMeasureSpec, childHeightMeasureSpec); } @@ -1283,8 +1284,11 @@ public class ScrollView extends FrameLayout { final int childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec, mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin + widthUsed, lp.width); + final int usedTotal = mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin + + heightUsed; final int childHeightMeasureSpec = MeasureSpec.makeSafeMeasureSpec( - MeasureSpec.getSize(parentHeightMeasureSpec), MeasureSpec.UNSPECIFIED); + Math.max(0, MeasureSpec.getSize(parentHeightMeasureSpec) - usedTotal), + MeasureSpec.UNSPECIFIED); child.measure(childWidthMeasureSpec, childHeightMeasureSpec); } |