diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-09-06 15:12:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-06 15:12:25 -0700 |
| commit | c6fc20a91bdf6f5d8cd8784324a55e39bcb7077c (patch) | |
| tree | cab9acf18171ad65b20f4fcc2f39de8f35f2a834 /core/java/android/view/View.java | |
| parent | fe1aafe4acd881712384fab8e9fb5d0b01232dab (diff) | |
| parent | e3bf88da23bfadd89a35b6dec769ea825e5ecd6e (diff) | |
| download | frameworks_base-c6fc20a91bdf6f5d8cd8784324a55e39bcb7077c.zip frameworks_base-c6fc20a91bdf6f5d8cd8784324a55e39bcb7077c.tar.gz frameworks_base-c6fc20a91bdf6f5d8cd8784324a55e39bcb7077c.tar.bz2 | |
Merge "Fix bug #5262565 Need to remove CharCount TextDirectionHeuristics"
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 76b22ab..ba23218 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -2568,26 +2568,18 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit public static final int TEXT_DIRECTION_ANY_RTL = 2; /** - * Text direction is the same as the one held by a 60% majority of the characters. If there is - * no majority then the paragraph direction is the resolved layout direction of the View. - * - * @hide - */ - public static final int TEXT_DIRECTION_CHAR_COUNT = 3; - - /** * Text direction is forced to LTR. * * @hide */ - public static final int TEXT_DIRECTION_LTR = 4; + public static final int TEXT_DIRECTION_LTR = 3; /** * Text direction is forced to RTL. * * @hide */ - public static final int TEXT_DIRECTION_RTL = 5; + public static final int TEXT_DIRECTION_RTL = 4; /** * Default text direction is inherited @@ -2603,7 +2595,6 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit @ViewDebug.IntToString(from = TEXT_DIRECTION_INHERIT, to = "INHERIT"), @ViewDebug.IntToString(from = TEXT_DIRECTION_FIRST_STRONG, to = "FIRST_STRONG"), @ViewDebug.IntToString(from = TEXT_DIRECTION_ANY_RTL, to = "ANY_RTL"), - @ViewDebug.IntToString(from = TEXT_DIRECTION_CHAR_COUNT, to = "CHAR_COUNT"), @ViewDebug.IntToString(from = TEXT_DIRECTION_LTR, to = "LTR"), @ViewDebug.IntToString(from = TEXT_DIRECTION_RTL, to = "RTL") }) @@ -2621,7 +2612,6 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit @ViewDebug.IntToString(from = TEXT_DIRECTION_INHERIT, to = "INHERIT"), @ViewDebug.IntToString(from = TEXT_DIRECTION_FIRST_STRONG, to = "FIRST_STRONG"), @ViewDebug.IntToString(from = TEXT_DIRECTION_ANY_RTL, to = "ANY_RTL"), - @ViewDebug.IntToString(from = TEXT_DIRECTION_CHAR_COUNT, to = "CHAR_COUNT"), @ViewDebug.IntToString(from = TEXT_DIRECTION_LTR, to = "LTR"), @ViewDebug.IntToString(from = TEXT_DIRECTION_RTL, to = "RTL") }) |