diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-07-15 09:49:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-15 09:49:48 -0700 |
| commit | 50e95eba5c7cf70a0ecbc50c0cf5b700201aa67f (patch) | |
| tree | 30bd9123b3c61be3f6fb163572e16fa24716c399 /core/tests | |
| parent | 38143a682274dd5f9212d9092ed3553f2ec3e88c (diff) | |
| parent | cb379120456d8065d742021fc5c66748fc8a11a8 (diff) | |
| download | frameworks_base-50e95eba5c7cf70a0ecbc50c0cf5b700201aa67f.zip frameworks_base-50e95eba5c7cf70a0ecbc50c0cf5b700201aa67f.tar.gz frameworks_base-50e95eba5c7cf70a0ecbc50c0cf5b700201aa67f.tar.bz2 | |
Merge "Implement textDirection heuristic selection."
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/widget/TextViewTest.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/tests/coretests/src/android/widget/TextViewTest.java b/core/tests/coretests/src/android/widget/TextViewTest.java index c54e4a1..7dc95db 100644 --- a/core/tests/coretests/src/android/widget/TextViewTest.java +++ b/core/tests/coretests/src/android/widget/TextViewTest.java @@ -16,13 +16,13 @@ package android.widget; -import com.android.frameworks.coretests.R; - import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.SmallTest; import android.text.GetChars; import android.view.View; +import com.android.frameworks.coretests.R; + /** * TextViewTest tests {@link TextView}. */ @@ -240,12 +240,12 @@ public class TextViewTest extends ActivityInstrumentationTestCase2<TextViewTestA getActivity().runOnUiThread(new Runnable() { public void run() { - tv.setTextDirection(View.TEXT_DIRECTION_FIRST_STRONG); + ll.setTextDirection(View.TEXT_DIRECTION_RTL); + tv.setTextDirection(View.TEXT_DIRECTION_INHERIT); assertEquals(View.TEXT_DIRECTION_RTL, tv.getResolvedTextDirection()); - assertEquals(true, tv.isResolvedTextDirection()); ll.removeView(tv); - assertEquals(false, tv.isResolvedTextDirection()); + assertEquals(View.TEXT_DIRECTION_FIRST_STRONG, tv.getResolvedTextDirection()); } }); } |