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

Commit 926f4ce0 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by Android (Google) Code Review
Browse files

Merge "Update font feature settings w3 URL in api doc"

parents bea9e036 317029ae

core/java/android/widget/TextView.java

+4 −4
Original line number Diff line number Diff line
@@ -3140,8 +3140,8 @@ 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>

     * <a href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">

     *     https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop</a>

     *

     * @return the currently set font feature settings.  Default is null.

     *
@@ -3212,8 +3212,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    /**

     * Sets 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>

     * <a href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">

     *     https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop</a>

     *

     * @param fontFeatureSettings font feature settings represented as CSS compatible string

     *

graphics/java/android/graphics/Paint.java

+4 −4
Original line number Diff line number Diff line
@@ -1496,8 +1496,8 @@ public class Paint { 
    /**

     * 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>

     * <a href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">

     *     https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop</a>

     *

     * @return the paint's currently set font feature settings. Default is null.

     *
@@ -1511,8 +1511,8 @@ public class Paint { 
     * Set 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>

     * <a href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">

     *     https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop</a>

     *

     * @see #getFontFeatureSettings()

     *