am 3d80f4a6: Merge "Anti-alias by default" into mnc-dev (15a0616d) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Paint.java

+13 −7

Original line number	Diff line number	Diff line
		@@ -184,8 +184,12 @@ public class Paint {
		/** @hide bit mask for the flag enabling vertical rendering for text */
		public static final int VERTICAL_TEXT_FLAG = 0x1000;

		// we use this when we first create a paint
		static final int DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG \| EMBEDDED_BITMAP_TEXT_FLAG;

		/** @hide default flags, even if unspecified */
		public static final int HIDDEN_DEFAULT_PAINT_FLAGS =
		DEV_KERN_TEXT_FLAG \| EMBEDDED_BITMAP_TEXT_FLAG;
		/** @hide default flags for no-param constructor */
		public static final int DEFAULT_PAINT_FLAGS = ANTI_ALIAS_FLAG;

		/**
		* Font hinter option that disables font hinting.
		@@ -415,9 +419,11 @@ public class Paint {

		/**
		* Create a new paint with default settings.
		*
		* As of {@link android.os.Build.VERSION_CODES#MNC}, sets {@link #ANTI_ALIAS_FLAG}.
		*/
		public Paint() {
		this(0);
		this(DEFAULT_PAINT_FLAGS);
		}

		/**
		@@ -428,7 +434,7 @@ public class Paint {
		*/
		public Paint(int flags) {
		mNativePaint = native_init();
		setFlags(flags \| DEFAULT_PAINT_FLAGS);
		setFlags(flags \| HIDDEN_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
		@@ -452,7 +458,7 @@ public class Paint {
		/** Restores the paint to its default settings. */
		public void reset() {
		native_reset(mNativePaint);
		setFlags(DEFAULT_PAINT_FLAGS);
		setFlags(DEFAULT_PAINT_FLAGS \| HIDDEN_DEFAULT_PAINT_FLAGS);

		// TODO: Turning off hinting has undesirable side effects, we need to
		// revisit hinting once we add support for subpixel positioning
		@@ -1870,7 +1876,7 @@ public class Paint {
		* Convenience overload that takes a char array instead of a
		* String.
		*
		* @see #getTextRunAdvances(String, int, int, int, int, int, float[], int)
		* @see #getTextRunAdvances(String, int, int, int, int, boolean, float[], int)
		* @hide
		*/
		public float getTextRunAdvances(char[] chars, int index, int count,
		@@ -1915,7 +1921,7 @@ public class Paint {
		* Convenience overload that takes a CharSequence instead of a
		* String.
		*
		* @see #getTextRunAdvances(String, int, int, int, int, int, float[], int)
		* @see #getTextRunAdvances(String, int, int, int, int, boolean, float[], int)
		* @hide
		*/
		public float getTextRunAdvances(CharSequence text, int start, int end,

tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1137,7 +1137,7 @@ public class Paint_Delegate {
		}

		private void reset() {
		mFlags = Paint.DEFAULT_PAINT_FLAGS;
		mFlags = Paint.DEFAULT_PAINT_FLAGS \| Paint.HIDDEN_DEFAULT_PAINT_FLAGS;
		mColor = 0xFF000000;
		mStyle = Paint.Style.FILL.nativeInt;
		mCap = Paint.Cap.BUTT.nativeInt;