commit 8b66b925698350ba2655601d6e437342d01027a0
author Wei Liu <luciferleo@google.com> Wed Nov 05 18:39:23 2014 -0800
committer Raph Levien <raph@google.com> Mon Nov 10 19:06:47 2014 +0000
tree 8d33b3e49289e188997e815f195e7095a570aca1
parent fe5e4f8e7cc10996392ef85d54658e8f731082e7

Fix failing TextViewTest#testTextAttr 

Set fontFamily to null overriding the value set in app theme.
Fix android.widget.cts.TextViewTest#testTextAttr

Bug: 18235143
Change-Id: I9beb2b7ee666bd4dcbc7e8239e4cdfb668114e52

tests/tests/widget/res/layout/textview_layout.xml

diff --git a/tests/tests/widget/res/layout/textview_layout.xml b/tests/tests/widget/res/layout/textview_layout.xml
index 419bbf9..bf7f757 100644
--- a/tests/tests/widget/res/layout/textview_layout.xml
+++ b/tests/tests/widget/res/layout/textview_layout.xml
@@ -27,6 +27,7 @@
                 android:layout_height="match_parent">
 
             <TextView android:id="@+id/textview_textAttr"
+                    android:fontFamily="@null"
                     android:text="@string/text_view_hello"
                     android:textColor="@drawable/black"
                     android:textColorHighlight="@drawable/yellow"