diff options
| author | Chris Craik <ccraik@google.com> | 2015-05-13 20:47:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 20:47:47 +0000 |
| commit | d6acd422aff35bc7cb8ab46fa422a4be7fffd026 (patch) | |
| tree | a3c70ac16107dc281459b9e16efa48ed58df0871 /graphics | |
| parent | 74a727d06100c7fb9bc3f4d0a1e1b29151172b58 (diff) | |
| parent | caa6226b1735ae074ec3861e2424bbd2276b88a0 (diff) | |
| download | frameworks_base-d6acd422aff35bc7cb8ab46fa422a4be7fffd026.zip frameworks_base-d6acd422aff35bc7cb8ab46fa422a4be7fffd026.tar.gz frameworks_base-d6acd422aff35bc7cb8ab46fa422a4be7fffd026.tar.bz2 | |
Merge "Revert "Anti-alias by default"" into mnc-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/Paint.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 20cd9b1..c5d68bd 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 |