From caa6226b1735ae074ec3861e2424bbd2276b88a0 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Wed, 13 May 2015 13:09:50 -0700 Subject: [PATCH] Revert "Anti-alias by default" bug:20948129 Keep HIDDEN_DEFAULT_PAINT_FLAGS name. This reverts commit 1b60cc0529161b5eca6407b551d67d355994c567. Change-Id: I97cd9c556375c74c52b006bda4fc7b3a2cfa89e1 --- graphics/java/android/graphics/Paint.java | 14 ++++---------- .../src/android/graphics/Paint_Delegate.java | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 20cd9b19c5d0a..c5d68bd230c18 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -184,12 +184,8 @@ public class Paint { /** @hide bit mask for the flag enabling vertical rendering for text */ public static final int VERTICAL_TEXT_FLAG = 0x1000; - - /** @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; + // These flags are always set on a new/reset paint, even if flags 0 is passed. + static final int HIDDEN_DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG; /** * Font hinter option that disables font hinting. @@ -419,11 +415,9 @@ 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(DEFAULT_PAINT_FLAGS); + this(0); } /** @@ -458,7 +452,7 @@ public class Paint { /** Restores the paint to its default settings. */ public void reset() { native_reset(mNativePaint); - setFlags(DEFAULT_PAINT_FLAGS | HIDDEN_DEFAULT_PAINT_FLAGS); + setFlags(HIDDEN_DEFAULT_PAINT_FLAGS); // TODO: Turning off hinting has undesirable side effects, we need to // revisit hinting once we add support for subpixel positioning diff --git a/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java index f5ef01be76810..0c8c0d6a18270 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java @@ -1137,7 +1137,7 @@ public class Paint_Delegate { } private void reset() { - mFlags = Paint.DEFAULT_PAINT_FLAGS | Paint.HIDDEN_DEFAULT_PAINT_FLAGS; + mFlags = Paint.HIDDEN_DEFAULT_PAINT_FLAGS; mColor = 0xFF000000; mStyle = Paint.Style.FILL.nativeInt; mCap = Paint.Cap.BUTT.nativeInt;