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

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

Merge "Update EditText.setEllipsize JavaDoc" into nyc-dev

parents 61aff95f 192d3bda

core/java/android/widget/EditText.java

+10 −0
Original line number Diff line number Diff line
@@ -117,6 +117,16 @@ public class EditText extends TextView { 
        Selection.extendSelection(getText(), index);

    }



    /**

     * Causes words in the text that are longer than the view's width to be ellipsized instead of

     * broken in the middle. {@link TextUtils.TruncateAt#MARQUEE

     * TextUtils.TruncateAt#MARQUEE} is not supported.

     *

     * @param ellipsis Type of ellipsis to be applied.

     * @throws IllegalArgumentException When the value of <code>ellipsis</code> parameter is

     *      {@link TextUtils.TruncateAt#MARQUEE}.

     * @see TextView#setEllipsize(TextUtils.TruncateAt)

     */

    @Override

    public void setEllipsize(TextUtils.TruncateAt ellipsis) {

        if (ellipsis == TextUtils.TruncateAt.MARQUEE) {

core/java/android/widget/TextView.java

+1 −1
Original line number Diff line number Diff line
@@ -7888,7 +7888,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }



    /**

     * Causes words in the text that are longer than the view is wide

     * Causes words in the text that are longer than the view's width

     * to be ellipsized instead of broken in the middle.  You may also

     * want to {@link #setSingleLine} or {@link #setHorizontallyScrolling}

     * to constrain the text to a single line.  Use <code>null</code>