Merge "Update Paint#mFontVariationSettings in set() and reset()" into oc-dev

2017-05-30 21:15:13 +00:00
parent bf7f23cc9c 425e719c46
commit d865c624bd
1 changed files with 2 additions and 0 deletions
--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
@@ -529,6 +529,7 @@ public class Paint {
        setTextLocales(LocaleList.getAdjustedDefault());
        setElegantTextHeight(false);
        mFontFeatureSettings = null;
+        mFontVariationSettings = null;
    }

    /**
@@ -565,6 +566,7 @@ public class Paint {
        mBidiFlags = paint.mBidiFlags;
        mLocales = paint.mLocales;
        mFontFeatureSettings = paint.mFontFeatureSettings;
+        mFontVariationSettings = paint.mFontVariationSettings;
    }

    /** @hide */