Merge "Update get/setFontFeatureSettings JavaDoc" into nyc-dev (eb90e440) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -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() {
		@@ -3184,11 +3190,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		/**
		* 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
		*/

graphics/java/android/graphics/Paint.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -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() {
		return mFontFeatureSettings;
		@@ -1506,7 +1511,10 @@ public class Paint {
		* Set 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>
		*
		* @see #getFontFeatureSettings()
		*
		* @param settings the font feature settings string to use, may be null.
		*/