diff options
| author | Ed Heyl <edheyl@google.com> | 2015-04-24 04:58:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-24 04:58:48 +0000 |
| commit | 88d109d2c5a62f2fb4a82f0ee78a535e56b10907 (patch) | |
| tree | 1bcd8141dbfb922c96f6644cc32a8d83dd2da16d /graphics | |
| parent | c30327cbb3f3826c3276953a73e10e47d4b5872e (diff) | |
| parent | 1c44ba9fd45635ec2c7ccdcc41557adf795d2bb5 (diff) | |
| download | frameworks_base-88d109d2c5a62f2fb4a82f0ee78a535e56b10907.zip frameworks_base-88d109d2c5a62f2fb4a82f0ee78a535e56b10907.tar.gz frameworks_base-88d109d2c5a62f2fb4a82f0ee78a535e56b10907.tar.bz2 | |
Merge "Fix the build: Revert "Anti-alias by default""
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/Paint.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 6385706..649d996 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -185,9 +185,7 @@ public class Paint { public static final int VERTICAL_TEXT_FLAG = 0x1000; // we use this when we first create a paint - private static final int HIDDEN_DEFAULT_PAINT_FLAGS = - DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG; - private static final int DEFAULT_PAINT_FLAGS = ANTI_ALIAS_FLAG; + static final int DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG; /** * Font hinter option that disables font hinting. @@ -417,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); } /** @@ -432,7 +428,7 @@ public class Paint { */ public Paint(int flags) { mNativePaint = native_init(); - setFlags(flags | HIDDEN_DEFAULT_PAINT_FLAGS); + setFlags(flags | 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 @@ -456,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(DEFAULT_PAINT_FLAGS); // TODO: Turning off hinting has undesirable side effects, we need to // revisit hinting once we add support for subpixel positioning @@ -1874,7 +1870,7 @@ public class Paint { * Convenience overload that takes a char array instead of a * String. * - * @see #getTextRunAdvances(String, int, int, int, int, boolean, float[], int) + * @see #getTextRunAdvances(String, int, int, int, int, int, float[], int) * @hide */ public float getTextRunAdvances(char[] chars, int index, int count, @@ -1919,7 +1915,7 @@ public class Paint { * Convenience overload that takes a CharSequence instead of a * String. * - * @see #getTextRunAdvances(String, int, int, int, int, boolean, float[], int) + * @see #getTextRunAdvances(String, int, int, int, int, int, float[], int) * @hide */ public float getTextRunAdvances(CharSequence text, int start, int end, |