Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ddd45e2 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 2b55d903: Merge "Don\'t match wrap_content/match_parent children with child... 

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

* commit '2b55d903':
  Don't match wrap_content/match_parent children with child count = 1. Bug #3328711
parents 7ba37ecd 2b55d903

core/java/android/widget/FrameLayout.java

+3 −3
Original line number Diff line number Diff line
@@ -297,8 +297,8 @@ public class FrameLayout extends ViewGroup { 
                resolveSizeAndState(maxHeight, heightMeasureSpec,

                        childState << MEASURED_HEIGHT_STATE_SHIFT));



        if (mMatchParentChildren.size() > 0) {

        count = mMatchParentChildren.size();

        if (count > 1) {

            for (int i = 0; i < count; i++) {

                final View child = mMatchParentChildren.get(i);

core/java/android/widget/HorizontalScrollView.java

+2 −0
Original line number Diff line number Diff line
@@ -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;



    /**

core/java/android/widget/ScrollView.java

+2 −0
Original line number Diff line number Diff line
@@ -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;



    /**