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

Commit a63794c9 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by android-build-merger
Browse files

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

am: 1ee4894e

Change-Id: I6c9bff56660ec6b6bddc48da9f629a571c7fe2d6
parents 1eb6a84d 1ee4894e

graphics/java/android/graphics/Paint.java

+2 −0
Original line number Diff line number Diff line
@@ -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 */