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

Commit 5b522e20 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by Android (Google) Code Review
Browse files

Merge "Update TextView ApiDoc for lineSpacing attributes"

parents 468300fd 7f9b0909

core/java/android/widget/TextView.java

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

    }





    /**

    /**

     * Sets line spacing for this TextView.  Each line will have its height

     * Sets line spacing for this TextView.  Each line other than the last line will have its height

     * multiplied by <code>mult</code> and have <code>add</code> added to it.

     * multiplied by {@code mult} and have {@code add} added to it.

     *

     *

     *

     * @attr ref android.R.styleable#TextView_lineSpacingExtra

     * @attr ref android.R.styleable#TextView_lineSpacingExtra

     * @attr ref android.R.styleable#TextView_lineSpacingMultiplier

     * @attr ref android.R.styleable#TextView_lineSpacingMultiplier

core/res/res/values/attrs.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -4677,9 +4677,11 @@ 
                 result to valid color values. Saturate(S + D) -->

                 result to valid color values. Saturate(S + D) -->

            <enum name="add" value="16" />

            <enum name="add" value="16" />

        </attr>

        </attr>

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

        <!-- Extra spacing between lines of text. The value will not be applied for the last

             line of text. -->

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

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

        <!-- Extra spacing between lines of text, as a multiplier. -->

        <!-- Extra spacing between lines of text, as a multiplier. The value will not be applied

             for the last line of text.-->

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

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

        <!-- The number of times to repeat the marquee animation. Only applied if the

        <!-- The number of times to repeat the marquee animation. Only applied if the

             TextView has marquee enabled. -->

             TextView has marquee enabled. -->