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

Commit c56a1a51 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Clarify text shadow attribute/method comments" into lmp-dev

parents 01e6a6fe 5faf85b6

core/java/android/widget/TextView.java

+9 −2
Original line number Diff line number Diff line
@@ -2867,8 +2867,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }



    /**

     * Gives the text a shadow of the specified radius and color, the specified

     * distance from its normal position.

     * Gives the text a shadow of the specified blur radius and color, the specified

     * distance from its drawn position.

     * <p>

     * The text shadow produced does not interact with the properties on view

     * that are responsible for real time shadows,

     * {@link View#getElevation() elevation} and

     * {@link View#getTranslationZ() translationZ}.

     *

     * @see Paint#setShadowLayer(float, float, float, int)

     *

     * @attr ref android.R.styleable#TextView_shadowColor

     * @attr ref android.R.styleable#TextView_shadowDx

core/res/res/values/attrs.xml

+16 −8
Original line number Diff line number Diff line
@@ -3799,13 +3799,17 @@ 
        <attr name="textColorLink" />

        <!-- Present the text in ALL CAPS. This may use a small-caps form when available. -->

        <attr name="textAllCaps" format="boolean" />

        <!-- Place a shadow of the specified color behind the text. -->

        <!-- Place a blurred shadow of text underneath the text, drawn with the

             specified color. The text shadow produced does not interact with

             properties on View that are responsible for real time shadows,

             {@link android.R.styleable#View_elevation elevation} and

             {@link android.R.styleable#View_translationZ translationZ}. -->

        <attr name="shadowColor" format="color" />

        <!-- Horizontal offset of the shadow. -->

        <!-- Horizontal offset of the text shadow. -->

        <attr name="shadowDx" format="float" />

        <!-- Vertical offset of the shadow. -->

        <!-- Vertical offset of the text shadow. -->

        <attr name="shadowDy" format="float" />

        <!-- Radius of the shadow. -->

        <!-- Blur radius of the text shadow. -->

        <attr name="shadowRadius" format="float" />

        <!-- Elegant text height, especially for less compacted complex script text. -->

        <attr name="elegantTextHeight" format="boolean" />
@@ -3946,13 +3950,17 @@ 
        <!-- Set an input filter to constrain the text length to the

             specified number. -->

        <attr name="maxLength" format="integer" min="0" />

        <!-- Place a shadow of the specified color behind the text. -->

        <!-- Place a blurred shadow of text underneath the text, drawn with the

             specified color. The text shadow produced does not interact with

             properties on View that are responsible for real time shadows,

             {@link android.R.styleable#View_elevation elevation} and

             {@link android.R.styleable#View_translationZ translationZ}. -->

        <attr name="shadowColor" />

        <!-- Horizontal offset of the shadow. -->

        <!-- Horizontal offset of the text shadow. -->

        <attr name="shadowDx" />

        <!-- Vertical offset of the shadow. -->

        <!-- Vertical offset of the text shadow. -->

        <attr name="shadowDy" />

        <!-- Radius of the shadow. -->

        <!-- Blur radius of the text shadow. -->

        <attr name="shadowRadius" />

        <attr name="autoLink" />

        <!-- If set to false, keeps the movement method from being set