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

Commit dd2dd7bb authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 955b66d0: Merge "reset() should reset. Otherwise it would be called... 

am 955b66d0: Merge "reset() should reset. Otherwise it would be called something else. Bug #7256095" into jb-mr1-dev

* commit '955b66d0':
  reset() should reset. Otherwise it would be called something else. Bug #7256095
parents 93cea34a 955b66d0

graphics/java/android/graphics/Paint.java

+19 −1
Original line number Diff line number Diff line
@@ -371,12 +371,30 @@ public class Paint { 
    public void reset() {

        native_reset(mNativePaint);

        setFlags(DEFAULT_PAINT_FLAGS);



        // TODO: Turning off hinting has undesirable side effects, we need to

        //       revisit hinting once we add support for subpixel positioning

        // setHinting(DisplayMetrics.DENSITY_DEVICE >= DisplayMetrics.DENSITY_TV

        //        ? HINTING_OFF : HINTING_ON);



        mColorFilter = null;

        mMaskFilter = null;

        mPathEffect = null;

        mRasterizer = null;

        mShader = null;

        mTypeface = null;

        mXfermode = null;



        mHasCompatScaling = false;

        mCompatScaling = mInvCompatScaling = 1;

        mCompatScaling = 1;

        mInvCompatScaling = 1;



        hasShadow = false;

        shadowDx = 0;

        shadowDy = 0;

        shadowRadius = 0;

        shadowColor = 0;



        mBidiFlags = BIDI_DEFAULT_LTR;

        setTextLocale(Locale.getDefault());

    }