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

Commit c46a5f02 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Make View paddingStart and paddingEnd API public"

parents 5093b63f 2c884826

api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -711,8 +711,10 @@ package android { 
    field public static final int packageNames = 16843649; // 0x1010381

    field public static final int padding = 16842965; // 0x10100d5

    field public static final int paddingBottom = 16842969; // 0x10100d9

    field public static final int paddingEnd = 16843690; // 0x10103aa

    field public static final int paddingLeft = 16842966; // 0x10100d6

    field public static final int paddingRight = 16842968; // 0x10100d8

    field public static final int paddingStart = 16843689; // 0x10103a9

    field public static final int paddingTop = 16842967; // 0x10100d7

    field public static final int panelBackground = 16842846; // 0x101005e

    field public static final int panelColorBackground = 16842849; // 0x1010061
@@ -23179,8 +23181,10 @@ package android.view { 
    method public android.view.View.OnFocusChangeListener getOnFocusChangeListener();

    method public int getOverScrollMode();

    method public int getPaddingBottom();

    method public int getPaddingEnd();

    method public int getPaddingLeft();

    method public int getPaddingRight();

    method public int getPaddingStart();

    method public int getPaddingTop();

    method public final android.view.ViewParent getParent();

    method public float getPivotX();
@@ -23256,6 +23260,7 @@ package android.view { 
    method public boolean isLongClickable();

    method public boolean isOpaque();

    method protected boolean isPaddingOffsetRequired();

    method public boolean isPaddingRelative();

    method public boolean isPressed();

    method public boolean isSaveEnabled();

    method public boolean isSaveFromParentEnabled();
@@ -23399,6 +23404,7 @@ package android.view { 
    method public void setOnTouchListener(android.view.View.OnTouchListener);

    method public void setOverScrollMode(int);

    method public void setPadding(int, int, int, int);

    method public void setPaddingRelative(int, int, int, int);

    method public void setPivotX(float);

    method public void setPivotY(float);

    method public void setPressed(boolean);

core/java/android/view/View.java

+0 −8
Original line number Diff line number Diff line
@@ -12249,8 +12249,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 
     * @param top the top padding in pixels

     * @param end the end padding in pixels

     * @param bottom the bottom padding in pixels

     *

     * @hide

     */

    public void setPaddingRelative(int start, int top, int end, int bottom) {

        mUserPaddingRelative = true;
@@ -12305,8 +12303,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 
     * scrollbars as well.

     *

     * @return the start padding in pixels

     *

     * @hide

     */

    public int getPaddingStart() {

        return (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
@@ -12330,8 +12326,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 
     * scrollbars as well.

     *

     * @return the end padding in pixels

     *

     * @hide

     */

    public int getPaddingEnd() {

        return (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
@@ -12345,8 +12339,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 
     * @attr ref android.R.styleable#View_paddingEnd

     *

     * @return true if the padding is relative or false if it is not.

     *

     * @hide

     */

    public boolean isPaddingRelative() {

        return mUserPaddingRelative;

core/res/res/values/public.xml

+3 −0
Original line number Diff line number Diff line
@@ -3499,4 +3499,7 @@ 


  <public type="attr" name="textDirection"/>



  <public type="attr" name="paddingStart"/>

  <public type="attr" name="paddingEnd"/>



</resources>