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

* commit '955b66d07db37bcec379a5cb9ea01aa72c54cdb4':
  reset() should reset. Otherwise it would be called something else. Bug #7256095
This commit is contained in:
Romain Guy
2012-09-30 11:26:41 -07:00
committed by Android Git Automerger

View File

@@ -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());
}