summaryrefslogtreecommitdiffstats
path: root/tests/AndroidTests
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-06 11:02:25 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-07-06 11:02:25 -0700
commit1eebdc04f04923f827f9346f4cf126d245330f89 (patch)
treeeb78004008784b51c2e7a1e285fe09c629b4c042 /tests/AndroidTests
parentae596082b5e2c6f7e0ad6535bea08d3f22b7c97f (diff)
parentd3de90f38d779d28a724e89297c83e6ba1a66fa7 (diff)
downloadframeworks_base-1eebdc04f04923f827f9346f4cf126d245330f89.zip
frameworks_base-1eebdc04f04923f827f9346f4cf126d245330f89.tar.gz
frameworks_base-1eebdc04f04923f827f9346f4cf126d245330f89.tar.bz2
am d3de90f3: Merge change 5995 into donut
Merge commit 'd3de90f38d779d28a724e89297c83e6ba1a66fa7' * commit 'd3de90f38d779d28a724e89297c83e6ba1a66fa7': Turn off kerning when testing TextUtils.ellipsize().
Diffstat (limited to 'tests/AndroidTests')
-rw-r--r--tests/AndroidTests/src/com/android/unit_tests/TextUtilsTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/AndroidTests/src/com/android/unit_tests/TextUtilsTest.java b/tests/AndroidTests/src/com/android/unit_tests/TextUtilsTest.java
index 51e841c..7720041 100644
--- a/tests/AndroidTests/src/com/android/unit_tests/TextUtilsTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/TextUtilsTest.java
@@ -276,6 +276,7 @@ public class TextUtilsTest extends TestCase {
Spannable s3 = new SpannableString(s1);
s3.setSpan(new StyleSpan(0), 5, 10, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
TextPaint p = new TextPaint();
+ p.setFlags(p.getFlags() & ~p.DEV_KERN_TEXT_FLAG);
for (int i = 0; i < 100; i++) {
for (int j = 0; j < 3; j++) {