Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update get/setFontFeatureSettings JavaDoc" into nyc-dev

Browse Source
This commit is contained in:
Siyamed Sinir
2016-03-28 23:16:19 +00:00
committed by Android (Google) Code Review
parent ada2c872fc 0925f40372
commit eb90e4406f
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/widget/TextView.java
View File

@@ -17,6 +17,7 @@
package android.widget; package android.widget;
import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
import android.R; import android.R;
import android.annotation.ColorInt; import android.annotation.ColorInt;
import android.annotation.DrawableRes; 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. * @return the currently set font feature settings. Default is null.
* *
* @see #setFontFeatureSettings(String) * @see #setFontFeatureSettings(String)
* @see Paint#setFontFeatureSettings * @see Paint#setFontFeatureSettings(String) Paint.setFontFeatureSettings(String)
*/ */
@Nullable @Nullable
public String getFontFeatureSettings() { 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: * 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 * @param fontFeatureSettings font feature settings represented as CSS compatible string
*
* @see #getFontFeatureSettings() * @see #getFontFeatureSettings()
* @see Paint#getFontFeatureSettings * @see Paint#getFontFeatureSettings() Paint.getFontFeatureSettings()
* *
* @attr ref android.R.styleable#TextView_fontFeatureSettings * @attr ref android.R.styleable#TextView_fontFeatureSettings
*/ */

14
graphics/java/android/graphics/Paint.java
View File

@@ -1494,9 +1494,14 @@ public class Paint {
} }
/** /**
* Get font feature settings. Default is null. * 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 paint's currently set font feature settings. * @return the paint's currently set font feature settings. Default is null.
*
* @see #setFontFeatureSettings(String)
*/ */
public String getFontFeatureSettings() { public String getFontFeatureSettings() {
return mFontFeatureSettings; return mFontFeatureSettings;
@@ -1506,7 +1511,10 @@ public class Paint {
* Set font feature settings. * Set font feature settings.
* *
* The format is the same as the CSS font-feature-settings attribute: * 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>
*
* @see #getFontFeatureSettings()
* *
* @param settings the font feature settings string to use, may be null. * @param settings the font feature settings string to use, may be null.
*/ */