Make FrameLayout support mixed wrap_content/match_parent children.

Bug #3259668

If a FrameLayout is measured with an UNSPECIFIED or AT_MOST spec,
it cannot correctly define the size of its children set to
match_parent. This change adds a second measurement pass similar
to what LinearLayout does in the same situation.

Change-Id: I20ac5203c2efc2e559f88b2c9573d4ad7df488b4

1 files changed, 3 insertions, 3 deletions

diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java
index f25edd8c05df..02f5a8b1dffc 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -326,8 +326,8 @@ public class ScrollView extends FrameLayout {
             if (child.getMeasuredHeight() < height) {
                 final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams();
 
-                int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, mPaddingLeft
-                        + mPaddingRight, lp.width);
+                int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,
+                        mPaddingLeft + mPaddingRight, lp.width);
                 height -= mPaddingTop;
                 height -= mPaddingBottom;
                 int childHeightMeasureSpec =
@@ -1327,7 +1327,7 @@ public class ScrollView extends FrameLayout {
         mIsLayoutDirty = false;
         // Give a child focus if it needs it
         if (mChildToScrollTo != null && isViewDescendantOf(mChildToScrollTo, this)) {
-                scrollToChild(mChildToScrollTo);
+            scrollToChild(mChildToScrollTo);
         }
         mChildToScrollTo = null;