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

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

Merge "Introduce TextView drawableStart and drawableEnd"

parents c93ffea2 a3b6b95f

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -377,9 +377,11 @@ package android { 
    field public static final int drawSelectorOnTop = 16843004; // 0x10100fc

    field public static final int drawable = 16843161; // 0x1010199

    field public static final int drawableBottom = 16843118; // 0x101016e

    field public static final int drawableEnd = 16843687; // 0x10103a7

    field public static final int drawableLeft = 16843119; // 0x101016f

    field public static final int drawablePadding = 16843121; // 0x1010171

    field public static final int drawableRight = 16843120; // 0x1010170

    field public static final int drawableStart = 16843686; // 0x10103a6

    field public static final int drawableTop = 16843117; // 0x101016d

    field public static final int drawingCacheQuality = 16842984; // 0x10100e8

    field public static final int dropDownAnchor = 16843363; // 0x1010263
@@ -26421,7 +26423,9 @@ package android.widget { 
    method protected void onTextChanged(java.lang.CharSequence, int, int, int);

    method public boolean onTextContextMenuItem(int);

    method public void removeTextChangedListener(android.text.TextWatcher);

    method protected void resetResolvedDrawables();

    method protected void resetResolvedLayoutDirection();

    method protected void resolveDrawables();

    method public void setAllCaps(boolean);

    method public final void setAutoLinkMask(int);

    method public void setCompoundDrawablePadding(int);

core/java/android/widget/TextView.java

+399 −7

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -3015,6 +3015,10 @@ 
        <attr name="drawableLeft" format="reference|color" />

        <!-- The drawable to be drawn to the right of the text. -->

        <attr name="drawableRight" format="reference|color" />

        <!-- The drawable to be drawn to the start of the text. -->

        <attr name="drawableStart" format="reference|color" />

        <!-- The drawable to be drawn to the end of the text. -->

        <attr name="drawableEnd" format="reference|color" />

        <!-- The padding between the drawables and the text. -->

        <attr name="drawablePadding" format="dimension" />

        <!-- Extra spacing between lines of text. -->

core/res/res/values/public.xml

+3 −0
Original line number Diff line number Diff line
@@ -1826,4 +1826,7 @@ 
  <public type="color" name="holo_purple" />

  <public type="color" name="holo_blue_bright" />



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

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



</resources>

tests/BiDiTests/res/layout/textview_drawables_ltr.xml

0 → 100644
+104 −0

File added.

Preview size limit exceeded, changes collapsed.