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

Merge "Revert "Anti-alias by default"" into mnc-dev

Browse Source
This commit is contained in:
Chris Craik
2015-05-13 20:47:46 +00:00
committed by Android (Google) Code Review
parent 74a727d061 caa6226b17
commit d6acd422af
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java
View File

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