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

Commit 8bcbb9bc authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Add LinearLayout#getGravity"

parents 485a8d14 efe916c3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45703,6 +45703,7 @@ package android.widget { 
    method public int getBaselineAlignedChildIndex();

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

    method public int getDividerPadding();

    method public int getGravity();

    method public int getOrientation();

    method public int getShowDividers();

    method public float getWeightSum();

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -48409,6 +48409,7 @@ package android.widget { 
    method public int getBaselineAlignedChildIndex();

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

    method public int getDividerPadding();

    method public int getGravity();

    method public int getOrientation();

    method public int getShowDividers();

    method public float getWeightSum();

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45719,6 +45719,7 @@ package android.widget { 
    method public int getBaselineAlignedChildIndex();

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

    method public int getDividerPadding();

    method public int getGravity();

    method public int getOrientation();

    method public int getShowDividers();

    method public float getWeightSum();

core/java/android/widget/LinearLayout.java

+10 −0
Original line number Diff line number Diff line
@@ -1781,6 +1781,16 @@ public class LinearLayout extends ViewGroup { 
        }

    }



    /**

     * Returns the current gravity. See {@link android.view.Gravity}

     *

     * @return the current gravity.

     * @see #setGravity

     */

    public int getGravity() {

        return mGravity;

    }



    @android.view.RemotableViewMethod

    public void setHorizontalGravity(int horizontalGravity) {

        final int gravity = horizontalGravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK;