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

Commit 7500ef14 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix API review javadoc issues in TextView/ExtractedText"

parents eb76f679 e0f35eea

core/java/android/view/inputmethod/ExtractedText.java

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import android.text.TextUtils; 
public class ExtractedText implements Parcelable {

    /**

     * The text that has been extracted.

     *

     * @see android.widget.TextView#getText()

     */

    public CharSequence text;
@@ -88,6 +90,8 @@ public class ExtractedText implements Parcelable { 


    /**

     * The hint that has been extracted.

     *

     * @see android.widget.TextView#getHint()

     */

    public CharSequence hint;

core/java/android/widget/TextView.java

+2 −2
Original line number Diff line number Diff line
@@ -3756,6 +3756,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     *

     * @param elegant set the paint's elegant metrics flag.

     *

     * @see #isElegantTextHeight()

     * @see Paint#isElegantTextHeight()

     *

     * @attr ref android.R.styleable#TextView_elegantTextHeight
@@ -9125,8 +9126,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


    /**

     *

     * Checks whether the transformation method applied to this TextView is set to ALL CAPS. This

     * settings is internally ignored if this field is editable or selectable.

     * Checks whether the transformation method applied to this TextView is set to ALL CAPS.

     * @return Whether the current transformation method is for ALL CAPS.

     *

     * @see #setAllCaps(boolean)