summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-02 10:46:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-07-02 10:46:37 -0700
commitd3de90f38d779d28a724e89297c83e6ba1a66fa7 (patch)
treef4c6431453bce2c25ebe54521c4c3128ec77ce17
parent3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc (diff)
parent1f0dac38df453035a8bd0205a23eecc44aa9d783 (diff)
downloadframeworks_base-d3de90f38d779d28a724e89297c83e6ba1a66fa7.zip
frameworks_base-d3de90f38d779d28a724e89297c83e6ba1a66fa7.tar.gz
frameworks_base-d3de90f38d779d28a724e89297c83e6ba1a66fa7.tar.bz2
Merge change 5995 into donut
* changes: Turn off kerning when testing TextUtils.ellipsize().
-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++) {