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

Merge "Don't match wrap_content/match_parent children with child count = 1. Bug #3328711" into honeycomb

Browse Source
This commit is contained in:
Romain Guy
2011-01-07 13:24:50 -08:00
committed by Android (Google) Code Review
parent 2358623917 a174d7a0d5
commit 2b55d9030e
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/FrameLayout.java
View File

@@ -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,

2
core/java/android/widget/HorizontalScrollView.java
View File

@@ -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;
/**

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

@@ -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;
/**