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

Commit 9ff994d9 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Introduce set/getFontVariationSettings. 

This is 2nd attempt of I249d464f8cdaa56017a987588b94ed685aadeb58.
The original CL was reverted due to conflicting with another CL submitted
before.
Nothing has changed except for following class name changes.

Here is the original commit message of reverted change.

This CL enables developers to specify axis values to the underlying
font collection. The specification of the font variation settings is
the same as the CSS font-variation-settings attribute in CSS working
draft as of 2016-11-30.

Code example: Here is an example to set width 100 and weight 1.5.

  TextView tv = (TextView) findViewById(R.id.textView);
  tv.setFontVariationSettings("'wdth' 100, 'wght' 1.5");

Bug: 33062398
Test: Manually done. Ran FrameworksGraphicsTests, CtsGraphicsTestCases
      and CtsWidgetTestCases

Change-Id: I9cdfbdecc87c995d805096883ef2652768c6c21e
parent ac2d1785

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -12731,6 +12731,7 @@ package android.graphics { 
    method public int getFontMetricsInt(android.graphics.Paint.FontMetricsInt);

    method public android.graphics.Paint.FontMetricsInt getFontMetricsInt();

    method public float getFontSpacing();

    method public java.lang.String getFontVariationSettings();

    method public int getHinting();

    method public float getLetterSpacing();

    method public android.graphics.MaskFilter getMaskFilter();
@@ -12788,6 +12789,7 @@ package android.graphics { 
    method public void setFilterBitmap(boolean);

    method public void setFlags(int);

    method public void setFontFeatureSettings(java.lang.String);

    method public void setFontVariationSettings(java.lang.String);

    method public void setHinting(int);

    method public void setLetterSpacing(float);

    method public void setLinearText(boolean);
@@ -49983,6 +49985,7 @@ package android.widget { 
    method public int getExtendedPaddingTop();

    method public android.text.InputFilter[] getFilters();

    method public java.lang.String getFontFeatureSettings();

    method public java.lang.String getFontVariationSettings();

    method public boolean getFreezesText();

    method public int getGravity();

    method public int getHighlightColor();
@@ -50092,6 +50095,7 @@ package android.widget { 
    method public void setExtractedText(android.view.inputmethod.ExtractedText);

    method public void setFilters(android.text.InputFilter[]);

    method public void setFontFeatureSettings(java.lang.String);

    method public void setFontVariationSettings(java.lang.String);

    method protected boolean setFrame(int, int, int, int);

    method public void setFreezesText(boolean);

    method public void setGravity(int);

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -13293,6 +13293,7 @@ package android.graphics { 
    method public int getFontMetricsInt(android.graphics.Paint.FontMetricsInt);

    method public android.graphics.Paint.FontMetricsInt getFontMetricsInt();

    method public float getFontSpacing();

    method public java.lang.String getFontVariationSettings();

    method public int getHinting();

    method public float getLetterSpacing();

    method public android.graphics.MaskFilter getMaskFilter();
@@ -13350,6 +13351,7 @@ package android.graphics { 
    method public void setFilterBitmap(boolean);

    method public void setFlags(int);

    method public void setFontFeatureSettings(java.lang.String);

    method public void setFontVariationSettings(java.lang.String);

    method public void setHinting(int);

    method public void setLetterSpacing(float);

    method public void setLinearText(boolean);
@@ -53749,6 +53751,7 @@ package android.widget { 
    method public int getExtendedPaddingTop();

    method public android.text.InputFilter[] getFilters();

    method public java.lang.String getFontFeatureSettings();

    method public java.lang.String getFontVariationSettings();

    method public boolean getFreezesText();

    method public int getGravity();

    method public int getHighlightColor();
@@ -53858,6 +53861,7 @@ package android.widget { 
    method public void setExtractedText(android.view.inputmethod.ExtractedText);

    method public void setFilters(android.text.InputFilter[]);

    method public void setFontFeatureSettings(java.lang.String);

    method public void setFontVariationSettings(java.lang.String);

    method protected boolean setFrame(int, int, int, int);

    method public void setFreezesText(boolean);

    method public void setGravity(int);

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -12765,6 +12765,7 @@ package android.graphics { 
    method public int getFontMetricsInt(android.graphics.Paint.FontMetricsInt);

    method public android.graphics.Paint.FontMetricsInt getFontMetricsInt();

    method public float getFontSpacing();

    method public java.lang.String getFontVariationSettings();

    method public int getHinting();

    method public float getLetterSpacing();

    method public android.graphics.MaskFilter getMaskFilter();
@@ -12822,6 +12823,7 @@ package android.graphics { 
    method public void setFilterBitmap(boolean);

    method public void setFlags(int);

    method public void setFontFeatureSettings(java.lang.String);

    method public void setFontVariationSettings(java.lang.String);

    method public void setHinting(int);

    method public void setLetterSpacing(float);

    method public void setLinearText(boolean);
@@ -50303,6 +50305,7 @@ package android.widget { 
    method public int getExtendedPaddingTop();

    method public android.text.InputFilter[] getFilters();

    method public java.lang.String getFontFeatureSettings();

    method public java.lang.String getFontVariationSettings();

    method public boolean getFreezesText();

    method public int getGravity();

    method public int getHighlightColor();
@@ -50412,6 +50415,7 @@ package android.widget { 
    method public void setExtractedText(android.view.inputmethod.ExtractedText);

    method public void setFilters(android.text.InputFilter[]);

    method public void setFontFeatureSettings(java.lang.String);

    method public void setFontVariationSettings(java.lang.String);

    method protected boolean setFrame(int, int, int, int);

    method public void setFreezesText(boolean);

    method public void setGravity(int);

core/java/android/widget/TextView.java

+49 −0
Original line number Diff line number Diff line
@@ -3432,6 +3432,20 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        return mTextPaint.getFontFeatureSettings();

    }



    /**

     * Returns the font variation settings.

     *

     * @return the currently set font variation settings.  Returns null if no variation is

     * specified.

     *

     * @see #setFontVariationSettings(String)

     * @see Paint#setFontVariationSettings(String) Paint.setFontVariationSettings(String)

     */

    @Nullable

    public String getFontVariationSettings() {

        return mTextPaint.getFontVariationSettings();

    }



    /**

     * Sets the break strategy for breaking paragraphs into lines. The default value for

     * TextView is {@link Layout#BREAK_STRATEGY_HIGH_QUALITY}, and the default value for
@@ -3538,6 +3552,41 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }





    /**

     * Sets TrueType or OpenType font variation settings. The settings string is constructed from

     * multiple pairs of axis tag and style values. The axis tag must contain four ASCII characters

     * and must be wrapped with single quotes (U+0027) or double quotes (U+0022). Axis strings that

     * are longer or shorter than four characters, or contain characters outside of U+0020..U+007E

     * are invalid. If a specified axis name is not defined in the font, the settings will be

     * ignored.

     *

     * <pre>

     *   textView.setFontVariationSettings("'wdth' 1.0");

     *   textView.setFontVariationSettings("'AX  ' 1.8, 'FB  ' 2.0");

     * </pre>

     *

     * @param fontVariationSettings font variation settings. You can pass null or empty string as

     *                              no variation settings.

     *

     * @see #getFontVariationSettings()

     * @see Paint#getFontVariationSettings() Paint.getFontVariationSettings()

     */

    public void setFontVariationSettings(@Nullable String fontVariationSettings) {

        final String existingSettings = mTextPaint.getFontVariationSettings();

        if (fontVariationSettings == existingSettings

                || (fontVariationSettings != null

                        && fontVariationSettings.equals(existingSettings))) {

            return;

        }

        mTextPaint.setFontVariationSettings(fontVariationSettings);



        if (mLayout != null) {

            nullLayouts();

            requestLayout();

            invalidate();

        }

    }



    /**

     * Sets the text color for all the states (normal, selected,

     * focused) to be this color.

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ LOCAL_SRC_FILES:= \ 
    android/graphics/ColorFilter.cpp \

    android/graphics/DrawFilter.cpp \

    android/graphics/FontFamily.cpp \

    android/graphics/FontUtils.cpp \

    android/graphics/CreateJavaOutputStreamAdaptor.cpp \

    android/graphics/GIFMovie.cpp \

    android/graphics/GraphicBuffer.cpp \