diff options
| author | Siyamed Sinir <siyamed@google.com> | 2016-03-25 18:25:39 -0700 |
|---|---|---|
| committer | Siyamed Sinir <siyamed@google.com> | 2016-03-28 16:14:46 -0700 |
| commit | 0925f40372cb140fd9e2a55ec0b5c645e90f3b84 (patch) | |
| tree | d1be7eba13cf0a339776a72d5464c22fc5658920 /core/java/android/widget/TextView.java | |
| parent | 396884ca84672f746b627fef27121e578fe9262e (diff) | |
Update get/setFontFeatureSettings JavaDoc
Add CSS font-feature-settings URL to get/setFontFeatureSettings method
JavaDoc in both TextView and Paint.
Bug: 27857640
Change-Id: I8c20068801032407d493e4f4a15b89dcf35949d2
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 31950970219f..a9af654b3ae9 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -17,6 +17,7 @@ package android.widget; import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; + import android.R; import android.annotation.ColorInt; import android.annotation.DrawableRes; @@ -3115,10 +3116,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } /** + * Returns the font feature settings. The format is the same as the CSS + * font-feature-settings attribute: + * <a href="http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings"> + * http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings</a> + * * @return the currently set font feature settings. Default is null. * * @see #setFontFeatureSettings(String) - * @see Paint#setFontFeatureSettings + * @see Paint#setFontFeatureSettings(String) Paint.setFontFeatureSettings(String) */ @Nullable public String getFontFeatureSettings() { @@ -3182,13 +3188,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } /** - * Sets font feature settings. The format is the same as the CSS + * Sets font feature settings. The format is the same as the CSS * font-feature-settings attribute: - * http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings + * <a href="http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings"> + * http://dev.w3.org/csswg/css-fonts/#propdef-font-feature-settings</a> * * @param fontFeatureSettings font feature settings represented as CSS compatible string + * * @see #getFontFeatureSettings() - * @see Paint#getFontFeatureSettings + * @see Paint#getFontFeatureSettings() Paint.getFontFeatureSettings() * * @attr ref android.R.styleable#TextView_fontFeatureSettings */ |