summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge/src/android/text/AndroidBidi_Delegate.java
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-06-25 17:47:16 -0700
committerDeepanshu Gupta <deepanshu@google.com>2014-07-01 12:23:59 -0700
commit84d1d431cfe3e66029380fa038f8816b06da120a (patch)
tree493379fed92ca918e8a5f6c1423585279b1bbfcf /tools/layoutlib/bridge/src/android/text/AndroidBidi_Delegate.java
parent509d860907691a8eb7ff4c8b949fbee36db70fea (diff)
downloadframeworks_base-84d1d431cfe3e66029380fa038f8816b06da120a.zip
frameworks_base-84d1d431cfe3e66029380fa038f8816b06da120a.tar.gz
frameworks_base-84d1d431cfe3e66029380fa038f8816b06da120a.tar.bz2
Update text rendering delegates.
The flags for RTL and LTR are simplified in commit 0a1d91862a3822dcbbb412bcd6d69b0f5f079f8b. This change follows up the same in LayoutLib. This also fixes the following bug which incorrectly computed runs with 'en-dash' (\u20132) as RTL. Bug: http://b.android.com/69432 Change-Id: Iaed62d13ce31f107773576ed2ef412be6037cd04
Diffstat (limited to 'tools/layoutlib/bridge/src/android/text/AndroidBidi_Delegate.java')
-rw-r--r--tools/layoutlib/bridge/src/android/text/AndroidBidi_Delegate.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/layoutlib/bridge/src/android/text/AndroidBidi_Delegate.java b/tools/layoutlib/bridge/src/android/text/AndroidBidi_Delegate.java
index 973fa0e..6247dae 100644
--- a/tools/layoutlib/bridge/src/android/text/AndroidBidi_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/text/AndroidBidi_Delegate.java
@@ -37,14 +37,17 @@ public class AndroidBidi_Delegate {
switch (dir) {
case 0: // Layout.DIR_REQUEST_LTR
+ dir = Bidi.LTR;
+ break;
case 1: // Layout.DIR_REQUEST_RTL
- break; // No change.
- case -1:
- dir = Bidi.LEVEL_DEFAULT_LTR;
+ dir = Bidi.RTL;
break;
- case -2:
+ case -1: // Layout.DIR_REQUEST_DEFAULT_RTL
dir = Bidi.LEVEL_DEFAULT_RTL;
break;
+ case -2: // Layout.DIR_REQUEST_DEFAULT_LTR
+ dir = Bidi.LEVEL_DEFAULT_LTR;
+ break;
default:
// Invalid code. Log error, assume LEVEL_DEFAULT_LTR and continue.
Bridge.getLog().error(LayoutLog.TAG_BROKEN, "Invalid direction flag", null);