Merge "Turn hinting back on" (3e1dc03a) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Paint.java

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ import android.text.GraphicsOperations;
	import android.text.SpannableString;		import android.text.SpannableString;
	import android.text.SpannedString;		import android.text.SpannedString;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.util.DisplayMetrics;

	/**		/**
	* The Paint class holds the style and color information about how to draw		* The Paint class holds the style and color information about how to draw
	@@ -344,8 +343,10 @@ public class Paint {
	public Paint(int flags) {		public Paint(int flags) {
	mNativePaint = native_init();		mNativePaint = native_init();
	setFlags(flags \| DEFAULT_PAINT_FLAGS);		setFlags(flags \| DEFAULT_PAINT_FLAGS);
	setHinting(DisplayMetrics.DENSITY_DEVICE >= DisplayMetrics.DENSITY_TV		// TODO: Turning off hinting has undesirable side effects, we need to
	? HINTING_OFF : HINTING_ON);		// revisit hinting once we add support for subpixel positioning
			// setHinting(DisplayMetrics.DENSITY_DEVICE >= DisplayMetrics.DENSITY_TV
			// ? HINTING_OFF : HINTING_ON);
	mCompatScaling = mInvCompatScaling = 1;		mCompatScaling = mInvCompatScaling = 1;
	}		}

	@@ -365,8 +366,10 @@ public class Paint {
	public void reset() {		public void reset() {
	native_reset(mNativePaint);		native_reset(mNativePaint);
	setFlags(DEFAULT_PAINT_FLAGS);		setFlags(DEFAULT_PAINT_FLAGS);
	setHinting(DisplayMetrics.DENSITY_DEVICE >= DisplayMetrics.DENSITY_TV		// TODO: Turning off hinting has undesirable side effects, we need to
	? HINTING_OFF : HINTING_ON);		// revisit hinting once we add support for subpixel positioning
			// setHinting(DisplayMetrics.DENSITY_DEVICE >= DisplayMetrics.DENSITY_TV
			// ? HINTING_OFF : HINTING_ON);
	mHasCompatScaling = false;		mHasCompatScaling = false;
	mCompatScaling = mInvCompatScaling = 1;		mCompatScaling = mInvCompatScaling = 1;
	mBidiFlags = BIDI_DEFAULT_LTR;		mBidiFlags = BIDI_DEFAULT_LTR;