diff options
| author | 2017-05-30 21:25:23 +0000 | |
|---|---|---|
| committer | 2017-05-30 21:25:23 +0000 | |
| commit | 1ee4894e6c3c421937c3a229de5c87132aac369e (patch) | |
| tree | 535856f14b3a7a7aefe4421e90d1bd8d97b49556 | |
| parent | 4f65a37a56c7b818fbdfbfa287df27a143d43717 (diff) | |
| parent | d865c624bda8130bdb03238e875dec9df5491e25 (diff) | |
Merge "Update Paint#mFontVariationSettings in set() and reset()" into oc-dev
am: d865c624bd
Change-Id: I45e58aa1a1ac7b5319a891e3d4f449099b13384d
| -rw-r--r-- | graphics/java/android/graphics/Paint.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index e62df8ff4742..b5b9fdbee878 100644 --- 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 */ |