commit 9d2fe4d7678656a358ca730fde8d50ef8623c28b
author Victoria Lease <violets@google.com> Fri Aug 09 13:52:57 2013 -0700
committer The Android Automerger <android-build@android.com> Mon Aug 12 12:31:45 2013 -0700
tree 7792e139a4446600d434a74c034a7039cbf63628
parent e40a4d0996ed7cfb8f05db85777214a788acee36

fix more default Paint flags CTS tests

Specifically, TextViewTest#testAccessPaintFlags and
TextPaintTest#testConstructor

Bug: 10210509
Change-Id: I618b17bbf2cbc4691df2f4708be127063de5aa8f

tests/tests/text/src/android/text/cts/TextPaintTest.java

diff --git a/tests/tests/text/src/android/text/cts/TextPaintTest.java b/tests/tests/text/src/android/text/cts/TextPaintTest.java
index fb34274..fef492b 100644
--- a/tests/tests/text/src/android/text/cts/TextPaintTest.java
+++ b/tests/tests/text/src/android/text/cts/TextPaintTest.java
@@ -25,7 +25,8 @@
  * Test {@link TextPaint}.
  */
 public class TextPaintTest extends AndroidTestCase {
-    private static final int DEFAULT_PAINT_FLAGS = TextPaint.DEV_KERN_TEXT_FLAG;
+    private static final int DEFAULT_PAINT_FLAGS = TextPaint.DEV_KERN_TEXT_FLAG
+            | TextPaint.EMBEDDED_BITMAP_TEXT_FLAG;
 
     public void testConstructor() {
         TextPaint textPaint;

tests/tests/widget/src/android/widget/cts/TextViewTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index 7f6efb1..9e03f84 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -632,7 +632,8 @@
 
     public void testAccessPaintFlags() {
         mTextView = new TextView(mActivity);
-        assertEquals(Paint.DEV_KERN_TEXT_FLAG | Paint.ANTI_ALIAS_FLAG, mTextView.getPaintFlags());
+        assertEquals(Paint.DEV_KERN_TEXT_FLAG | Paint.EMBEDDED_BITMAP_TEXT_FLAG
+                | Paint.ANTI_ALIAS_FLAG, mTextView.getPaintFlags());
 
         mTextView.setPaintFlags(Paint.UNDERLINE_TEXT_FLAG | Paint.FAKE_BOLD_TEXT_FLAG);
         assertEquals(Paint.UNDERLINE_TEXT_FLAG | Paint.FAKE_BOLD_TEXT_FLAG,