diff options
| -rw-r--r-- | core/java/android/widget/FrameLayout.java | 6 | ||||
| -rw-r--r-- | core/java/android/widget/HorizontalScrollView.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 2bc63019fcc6..8c7205e26618 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -297,15 +297,15 @@ public class FrameLayout extends ViewGroup { resolveSizeAndState(maxHeight, heightMeasureSpec, childState << MEASURED_HEIGHT_STATE_SHIFT)); - if (mMatchParentChildren.size() > 0) { - count = mMatchParentChildren.size(); + count = mMatchParentChildren.size(); + if (count > 1) { for (int i = 0; i < count; i++) { final View child = mMatchParentChildren.get(i); final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams(); int childWidthMeasureSpec; int childHeightMeasureSpec; - + if (lp.width == LayoutParams.MATCH_PARENT) { childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(getMeasuredWidth() - mPaddingLeft - mPaddingRight - lp.leftMargin - lp.rightMargin, diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 50867b9514d0..f6b1dbc99b40 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -16,6 +16,7 @@ package android.widget; +import android.view.ViewDebug; import com.android.internal.R; import android.util.AttributeSet; @@ -115,6 +116,7 @@ public class HorizontalScrollView extends FrameLayout { * When set to true, the scroll view measure its child to make it fill the currently * visible area. */ + @ViewDebug.ExportedProperty(category = "layout") private boolean mFillViewport; /** diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 02f5a8b1dffc..8558c70e40de 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -16,6 +16,7 @@ package android.widget; +import android.view.ViewDebug; import com.android.internal.R; import android.content.Context; @@ -110,6 +111,7 @@ public class ScrollView extends FrameLayout { * When set to true, the scroll view measure its child to make it fill the currently * visible area. */ + @ViewDebug.ExportedProperty(category = "layout") private boolean mFillViewport; /** |