commit 1c44ba9fd45635ec2c7ccdcc41557adf795d2bb5
author Ed Heyl <edheyl@google.com> Fri Apr 24 04:57:24 2015 +0000
committer Ed Heyl <edheyl@google.com> Fri Apr 24 04:57:24 2015 +0000
tree a33af2d7be71164d459e571a7320473736291b1f
parent d34b7329935a6f9ffdc9a40c01f7b558e07830d4

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

This reverts commit d34b7329935a6f9ffdc9a40c01f7b558e07830d4.

Change-Id: I74e63570ce868e6d8c36fd2e1c864419bd6102e4

graphics/java/android/graphics/Paint.java

diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index 22915a3..cd5f59d 100644
--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
@@ -185,9 +185,7 @@
     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 @@
 
     /**
      * 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 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 @@
     /** 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 @@
      * 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 @@
      * 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,