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

Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-06-05 17:18:45 +00:00
committed by Android (Google) Code Review
parent eb974d5ac4 97e1be8ef6
commit 42cc892be1
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/widget/ScrollView.java
View File

@@ -18,6 +18,7 @@ package android.widget;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.os.Build; import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import com.android.internal.R; import com.android.internal.R;
@@ -349,17 +350,24 @@ public class ScrollView extends FrameLayout {
if (getChildCount() > 0) { if (getChildCount() > 0) {
final View child = getChildAt(0); final View child = getChildAt(0);
int height = getMeasuredHeight(); final int height = getMeasuredHeight();
if (child.getMeasuredHeight() < height) { if (child.getMeasuredHeight() < height) {
final int widthPadding;
final int heightPadding;
final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams(); final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams();
final int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion;
if (targetSdkVersion >= VERSION_CODES.MNC) {
widthPadding = mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin;
heightPadding = mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin;
} else {
widthPadding = mPaddingLeft + mPaddingRight;
heightPadding = mPaddingTop + mPaddingBottom;
}
int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, final int childWidthMeasureSpec = getChildMeasureSpec(
mPaddingLeft + mPaddingRight, lp.width); widthMeasureSpec, widthPadding, lp.width);
height -= mPaddingTop; final int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(
height -= mPaddingBottom; height - heightPadding, MeasureSpec.EXACTLY);
int childHeightMeasureSpec =
MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
} }
} }