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

Commit b001475f authored by Philip Milne's avatar Philip Milne Committed by Android (Google) Code Review
Browse files

Merge "Fixes for bugs: #6103660, #6103957, #6104457 and #6104322."

parents 9dc348d7 1018fb42

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -26489,6 +26489,7 @@ package android.widget { 
    ctor public FrameLayout(android.content.Context, android.util.AttributeSet, int);

    method public deprecated boolean getConsiderGoneChildrenWhenMeasuring();

    method public android.graphics.drawable.Drawable getForeground();

    method public int getForegroundGravity();

    method public boolean getMeasureAllChildren();

    method protected void onLayout(boolean, int, int, int, int);

    method public void setForeground(android.graphics.drawable.Drawable);
@@ -26717,6 +26718,7 @@ package android.widget { 
    ctor public LinearLayout(android.content.Context, android.util.AttributeSet);

    ctor public LinearLayout(android.content.Context, android.util.AttributeSet, int);

    method public int getBaselineAlignedChildIndex();

    method public android.graphics.drawable.Drawable getDividerDrawable();

    method public int getDividerPadding();

    method public int getOrientation();

    method public int getShowDividers();
@@ -27141,6 +27143,7 @@ package android.widget { 
    ctor public RelativeLayout(android.content.Context);

    ctor public RelativeLayout(android.content.Context, android.util.AttributeSet);

    ctor public RelativeLayout(android.content.Context, android.util.AttributeSet, int);

    method public int getGravity();

    method protected void onLayout(boolean, int, int, int, int);

    method public void setGravity(int);

    method public void setHorizontalGravity(int);

core/java/android/widget/FrameLayout.java

+15 −0
Original line number Diff line number Diff line
@@ -121,11 +121,26 @@ public class FrameLayout extends ViewGroup { 
        a.recycle();

    }



    /**

     * Describes how the foreground is positioned.

     *

     * @return foreground gravity.

     *

     * @see #setForegroundGravity(int)

     *

     * @attr ref android.R.styleable#FrameLayout_foregroundGravity

     */

    public int getForegroundGravity() {

        return mForegroundGravity;

    }



    /**

     * Describes how the foreground is positioned. Defaults to START and TOP.

     *

     * @param foregroundGravity See {@link android.view.Gravity}

     *

     * @see #getForegroundGravity()

     *

     * @attr ref android.R.styleable#FrameLayout_foregroundGravity

     */

    @android.view.RemotableViewMethod

core/java/android/widget/LinearLayout.java

+19 −0
Original line number Diff line number Diff line
@@ -234,10 +234,25 @@ public class LinearLayout extends ViewGroup { 
        return mShowDividers;

    }



    /**

     * @return the divider Drawable that will divide each item.

     *

     * @see #setDividerDrawable(Drawable)

     *

     * @attr ref android.R.styleable#LinearLayout_divider

     */

    public Drawable getDividerDrawable() {

        return mDivider;

    }



    /**

     * Set a drawable to be used as a divider between items.

     *

     * @param divider Drawable that will divide each item.

     *

     * @see #setShowDividers(int)

     *

     * @attr ref android.R.styleable#LinearLayout_divider

     */

    public void setDividerDrawable(Drawable divider) {

        if (divider == mDivider) {
@@ -398,6 +413,8 @@ public class LinearLayout extends ViewGroup { 
     * 

     * @return True to measure children with a weight using the minimum

     *         size of the largest child, false otherwise.

     *

     * @attr ref android.R.styleable#LinearLayout_measureWithLargestChild

     */

    public boolean isMeasureWithLargestChildEnabled() {

        return mUseLargestChild;
@@ -412,6 +429,8 @@ public class LinearLayout extends ViewGroup { 
     * 

     * @param enabled True to measure children with a weight using the

     *        minimum size of the largest child, false otherwise.

     *

     * @attr ref android.R.styleable#LinearLayout_measureWithLargestChild

     */

    @android.view.RemotableViewMethod

    public void setMeasureWithLargestChildEnabled(boolean enabled) {

core/java/android/widget/RelativeLayout.java

+14 −0
Original line number Diff line number Diff line
@@ -218,6 +218,20 @@ public class RelativeLayout extends ViewGroup { 
        mIgnoreGravity = viewId;

    }



    /**

     * Describes how the child views are positioned.

     *

     * @return the gravity.

     *

     * @see #setGravity(int)

     * @see android.view.Gravity

     *

     * @attr ref android.R.styleable#RelativeLayout_gravity

     */

    public int getGravity() {

        return mGravity;

    }



    /**

     * Describes how the child views are positioned. Defaults to

     * <code>Gravity.LEFT | Gravity.TOP</code>.

core/java/android/widget/TableLayout.java

+4 −0
Original line number Diff line number Diff line
@@ -232,6 +232,8 @@ public class TableLayout extends LinearLayout { 
     * <p>Indicates whether all columns are shrinkable or not.</p>

     *

     * @return true if all columns are shrinkable, false otherwise

     *

     * @attr ref android.R.styleable#TableLayout_shrinkColumns

     */

    public boolean isShrinkAllColumns() {

        return mShrinkAllColumns;
@@ -252,6 +254,8 @@ public class TableLayout extends LinearLayout { 
     * <p>Indicates whether all columns are stretchable or not.</p>

     *

     * @return true if all columns are stretchable, false otherwise

     *

     * @attr ref android.R.styleable#TableLayout_stretchColumns

     */

    public boolean isStretchAllColumns() {

        return mStretchAllColumns;