commit 4e6308dd361061f208ade404ff957c1d77a278c0
author Siyamed Sinir <siyamed@google.com> Fri Dec 22 18:16:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 22 18:16:54 2017 +0000
tree 607e3593326efb2837985a53471752453772c475
parent 79fb153bc8c95d1ac0b75c365f0edec7a172599b
parent e864f15ef115ebbeee27aa2a6dad99b004dcc526

Merge "Fix TextViewTest.testFallbackLineSpacing on small devices"

core/tests/coretests/src/android/widget/TextViewTest.java

diff --git a/core/tests/coretests/src/android/widget/TextViewTest.java b/core/tests/coretests/src/android/widget/TextViewTest.java
index 7875c17..5dec42e 100644
--- a/core/tests/coretests/src/android/widget/TextViewTest.java
+++ b/core/tests/coretests/src/android/widget/TextViewTest.java
@@ -35,6 +35,7 @@
 import android.text.Layout;
 import android.text.Selection;
 import android.text.Spannable;
+import android.util.TypedValue;
 import android.view.View;
 
 import org.junit.Before;
@@ -274,7 +275,7 @@
                 new FontFallbackSetup("DynamicLayout", testFontFiles, xml)) {
             mTextView = new TextView(mActivity);
             mTextView.setTypeface(setup.getTypefaceFor("sans-serif"));
-            mTextView.setTextSize(100);
+            mTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 100);
             mTextView.setText("aaaaa aabaa aaaaa"); // This should result in three lines.
             mTextView.setPadding(0, 0, 0, 0);
             mTextView.setIncludeFontPadding(false);