summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2013-03-19 20:45:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-19 20:45:52 +0000
commit5054803a022b0df4cc616e19085ed6fb70ed33e8 (patch)
tree0186f6c5b7b42e888f1e0a9f2492f778fb5cf083 /core/java
parent80828f465aea8cb34928c1467ac518e33bcca1b9 (diff)
parent83f15e657cc131ba1095d63fe22256d62800210e (diff)
Merge "Add missing ViewDebug infos for View.getTextDirection()" into jb-mr2-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/View.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 2fa9484b6f4a..34f5a2bed932 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -16990,6 +16990,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @attr ref android.R.styleable#View_textDirection
*/
+ @ViewDebug.ExportedProperty(category = "text", mapping = {
+ @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_LTR, to = "LTR"),
+ @ViewDebug.IntToString(from = TEXT_DIRECTION_RTL, to = "RTL"),
+ @ViewDebug.IntToString(from = TEXT_DIRECTION_LOCALE, to = "LOCALE")
+ })
public int getTextDirection() {
return (mPrivateFlags2 & PFLAG2_TEXT_DIRECTION_RESOLVED_MASK) >> PFLAG2_TEXT_DIRECTION_RESOLVED_MASK_SHIFT;
}