diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-04-18 11:15:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-18 11:15:57 -0700 |
| commit | f7b9e7848623efcb4f596aa06f055bb4d2ebe7f5 (patch) | |
| tree | 3e18905c9bd88828217e6aed6603f3e49e988faa /core/jni/android/graphics/TextLayout.h | |
| parent | 95814b0268ce3943930156afd3f423af8afed8e9 (diff) | |
| parent | 689e515ed2b8064c15e54d8ab69d87de54c5e0d6 (diff) | |
| download | frameworks_base-f7b9e7848623efcb4f596aa06f055bb4d2ebe7f5.zip frameworks_base-f7b9e7848623efcb4f596aa06f055bb4d2ebe7f5.tar.gz frameworks_base-f7b9e7848623efcb4f596aa06f055bb4d2ebe7f5.tar.bz2 | |
Merge "Add Unicode BiDi Algo before drawing text in Canvas"
Diffstat (limited to 'core/jni/android/graphics/TextLayout.h')
| -rw-r--r-- | core/jni/android/graphics/TextLayout.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/core/jni/android/graphics/TextLayout.h b/core/jni/android/graphics/TextLayout.h index f203b75..9bb1b92 100644 --- a/core/jni/android/graphics/TextLayout.h +++ b/core/jni/android/graphics/TextLayout.h @@ -46,26 +46,26 @@ namespace android { static TextLayoutCache gTextLayoutCache; #endif -class TextLayout { -public: - - enum { - kDirection_LTR = 0, - kDirection_RTL = 1, +enum { + kBidi_LTR = 0, + kBidi_RTL = 1, + kBidi_Default_LTR = 2, + kBidi_Default_RTL = 3, + kBidi_Force_LTR = 4, + kBidi_Force_RTL = 5, + + kBidi_Mask = 0x7 +}; - kDirection_Mask = 0x1 - }; +enum { + kDirection_LTR = 0, + kDirection_RTL = 1, - enum { - kBidi_LTR = 0, - kBidi_RTL = 1, - kBidi_Default_LTR = 2, - kBidi_Default_RTL = 3, - kBidi_Force_LTR = 4, - kBidi_Force_RTL = 5, + kDirection_Mask = 0x1 +}; - kBidi_Mask = 0x7 - }; +class TextLayout { +public: /* * Draws a unidirectional run of text. |