Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the build: Revert "Anti-alias by default"

Browse Source 
This reverts commit d34b732993.

Change-Id: I74e63570ce868e6d8c36fd2e1c864419bd6102e4
This commit is contained in:
Ed Heyl
2015-04-24 04:57:24 +00:00
parent d34b732993
commit 1c44ba9fd4
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
graphics/java/android/graphics/Paint.java
View File

@@ -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,