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

Commit 0ed64376 authored by Haoyu Zhang's avatar Haoyu Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add Missing fontVariationSetting attr Javadoc"

parents 629d31c5 aff7bd76

core/java/android/widget/TextView.java

+3 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ import java.util.function.Supplier; 
 * @attr ref android.R.styleable#TextView_fallbackLineSpacing

 * @attr ref android.R.styleable#TextView_letterSpacing

 * @attr ref android.R.styleable#TextView_fontFeatureSettings

 * @attr ref android.R.styleable#TextView_fontVariationSettings

 * @attr ref android.R.styleable#TextView_breakStrategy

 * @attr ref android.R.styleable#TextView_hyphenationFrequency

 * @attr ref android.R.styleable#TextView_autoSizeTextType
@@ -4382,6 +4383,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     *

     * @see #getFontVariationSettings()

     * @see FontVariationAxis

     *

     * @attr ref android.R.styleable#TextView_fontVariationSettings

     */

    public boolean setFontVariationSettings(@Nullable String fontVariationSettings) {

        final String existingSettings = mTextPaint.getFontVariationSettings();