Merge "Turn off hinting by default for higher density displays." (9beeb95c) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -8216,6 +8216,7 @@ package android.graphics {
		method public int getFontMetricsInt(android.graphics.Paint.FontMetricsInt);
		method public android.graphics.Paint.FontMetricsInt getFontMetricsInt();
		method public float getFontSpacing();
		method public int getHinting();
		method public android.graphics.MaskFilter getMaskFilter();
		method public android.graphics.PathEffect getPathEffect();
		method public android.graphics.Rasterizer getRasterizer();
		@@ -8262,6 +8263,7 @@ package android.graphics {
		method public void setFakeBoldText(boolean);
		method public void setFilterBitmap(boolean);
		method public void setFlags(int);
		method public void setHinting(int);
		method public void setLinearText(boolean);
		method public android.graphics.MaskFilter setMaskFilter(android.graphics.MaskFilter);
		method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect);
		@@ -8287,6 +8289,8 @@ package android.graphics {
		field public static final int DITHER_FLAG = 4; // 0x4
		field public static final int FAKE_BOLD_TEXT_FLAG = 32; // 0x20
		field public static final int FILTER_BITMAP_FLAG = 2; // 0x2
		field public static final int HINTING_OFF = 0; // 0x0
		field public static final int HINTING_ON = 1; // 0x1
		field public static final int LINEAR_TEXT_FLAG = 64; // 0x40
		field public static final int STRIKE_THRU_TEXT_FLAG = 16; // 0x10
		field public static final int SUBPIXEL_TEXT_FLAG = 128; // 0x80

core/jni/android/graphics/Paint.cpp

+18 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,10 @@
		** limitations under the License.
		*/

		#define LOG_TAG "Paint"

		#include <utils/Log.h>

		#include "jni.h"
		#include "GraphicsJNI.h"
		#include <android_runtime/AndroidRuntime.h>
		@@ -50,8 +54,6 @@ static jclass gFontMetricsInt_class;
		static JMetricsID gFontMetricsInt_fieldID;

		static void defaultSettingsForAndroid(SkPaint* paint) {
		// looks best we decided
		paint->setHinting(SkPaint::kSlight_Hinting);
		// utf16 is required for java
		paint->setTextEncoding(SkPaint::kUTF16_TextEncoding);
		}
		@@ -96,6 +98,18 @@ public:
		GraphicsJNI::getNativePaint(env, paint)->setFlags(flags);
		}

		static jint getHinting(JNIEnv* env, jobject paint) {
		NPE_CHECK_RETURN_ZERO(env, paint);
		return GraphicsJNI::getNativePaint(env, paint)->getHinting()
		== SkPaint::kNo_Hinting ? 0 : 1;
		}

		static void setHinting(JNIEnv* env, jobject paint, jint mode) {
		NPE_CHECK_RETURN_VOID(env, paint);
		GraphicsJNI::getNativePaint(env, paint)->setHinting(
		mode == 0 ? SkPaint::kNo_Hinting : SkPaint::kSlight_Hinting);
		}

		static void setAntiAlias(JNIEnv* env, jobject paint, jboolean aa) {
		NPE_CHECK_RETURN_VOID(env, paint);
		GraphicsJNI::getNativePaint(env, paint)->setAntiAlias(aa);
		@@ -833,6 +847,8 @@ static JNINativeMethod methods[] = {
		{"native_set","(II)V", (void*) SkPaintGlue::assign},
		{"getFlags","()I", (void*) SkPaintGlue::getFlags},
		{"setFlags","(I)V", (void*) SkPaintGlue::setFlags},
		{"getHinting","()I", (void*) SkPaintGlue::getHinting},
		{"setHinting","(I)V", (void*) SkPaintGlue::setHinting},
		{"setAntiAlias","(Z)V", (void*) SkPaintGlue::setAntiAlias},
		{"setSubpixelText","(Z)V", (void*) SkPaintGlue::setSubpixelText},
		{"setLinearText","(Z)V", (void*) SkPaintGlue::setLinearText},

graphics/java/android/graphics/Paint.java

+27 −0

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

		/**
		* The Paint class holds the style and color information about how to draw
		@@ -105,6 +106,16 @@ public class Paint {
		// we use this when we first create a paint
		static final int DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG;

		/**
		* Option for {@link #setHinting}: disable hinting.
		*/
		public static final int HINTING_OFF = 0x0;

		/**
		* Option for {@link #setHinting}: enable hinting.
		*/
		public static final int HINTING_ON = 0x1;

		/**
		* Bidi flag to set LTR paragraph direction.
		*
		@@ -333,6 +344,8 @@ public class Paint {
		public Paint(int flags) {
		mNativePaint = native_init();
		setFlags(flags \| DEFAULT_PAINT_FLAGS);
		setHinting(DisplayMetrics.DENSITY_DEVICE >= DisplayMetrics.DENSITY_TV
		? HINTING_OFF : HINTING_ON);
		mCompatScaling = mInvCompatScaling = 1;
		}

		@@ -367,6 +380,8 @@ public class Paint {
		public void reset() {
		native_reset(mNativePaint);
		setFlags(DEFAULT_PAINT_FLAGS);
		setHinting(DisplayMetrics.DENSITY_DEVICE >= DisplayMetrics.DENSITY_TV
		? HINTING_OFF : HINTING_ON);
		mHasCompatScaling = false;
		mCompatScaling = mInvCompatScaling = 1;
		mBidiFlags = BIDI_DEFAULT_LTR;
		@@ -445,6 +460,18 @@ public class Paint {
		*/
		public native void setFlags(int flags);

		/**
		* Return the paint's hinting mode. Returns either
		* {@link #HINTING_OFF} or {@link #HINTING_ON}.
		*/
		public native int getHinting();

		/**
		* Set the paint's hinting mode. May be either
		* {@link #HINTING_OFF} or {@link #HINTING_ON}.
		*/
		public native void setHinting(int mode);

		/**
		* Helper for getFlags(), returning true if ANTI_ALIAS_FLAG bit is set
		* AntiAliasing smooths out the edges of what is being drawn, but is has