Changed TextViewTest to ignore DeviceDefault theme.

Added typeface attribute in layout
to pass test TextViewTest.testTextAttr
even if DeviceDefault theme specifies
a different value.

Signed-off-by: Peter Eliasson <peter.eliasson@sonymobile.com>
Change-Id: Iccb1833c52220e9b5471aaded0fc01623c1ed743
diff --git a/tests/res/layout/textview_layout.xml b/tests/res/layout/textview_layout.xml
index 0c6796b..f9ae74a 100644
--- a/tests/res/layout/textview_layout.xml
+++ b/tests/res/layout/textview_layout.xml
@@ -29,6 +29,7 @@
                     android:textColorHint="@drawable/red"
                     android:textColorLink="@drawable/blue"
                     android:textScaleX="1.2"
+                    android:typeface="normal"
                     android:textSize="20px"
                     android:textStyle="normal"
                     android:layout_width="wrap_content"
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index a091c05..9319735 100755
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -2406,7 +2406,7 @@
     })
     @UiThreadTest
     @ToBeFixed(bug = "1386429", explanation = "mTextView.getTypeface() will be null "
-            + "if typeface didn't be set or set to normal "
+            + "if typeface is set to normal "
             + "and style didn't set or set to normal in xml."
             + "And there is no getter to check the highlight colour.")
     public void testTextAttr() {
@@ -2441,7 +2441,7 @@
         assertEquals(20f, mTextView.getTextSize(), 0.01f);
 
         // getTypeface
-        // getTypeface will be null if android:typeface is not set or is set to normal,
+        // getTypeface will be null if android:typeface is set to normal,
         // and android:style is not set or is set to normal
         assertNull(mTextView.getTypeface());