diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-04-04 14:17:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-04 14:17:22 -0700 |
| commit | d779412c58d329ada4d1d79bdb85700e90cbc8d6 (patch) | |
| tree | 116990a4f91dc01526b67aee58ba2b1d04bde95f /core/res | |
| parent | 1da8f00a4cc3554b1501f60932e44b5ca56a5e7e (diff) | |
| parent | 9da0f8a5c4bccf8e722ae2ebf43873457aec3271 (diff) | |
| download | frameworks_base-d779412c58d329ada4d1d79bdb85700e90cbc8d6.zip frameworks_base-d779412c58d329ada4d1d79bdb85700e90cbc8d6.tar.gz frameworks_base-d779412c58d329ada4d1d79bdb85700e90cbc8d6.tar.bz2 | |
Merge "Add View textAlignment"
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/attrs.xml | 24 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 438c141..2b27585 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2079,6 +2079,7 @@ <!-- Locale --> <enum name="locale" value="3" /> </attr> + <!-- Direction of the text. A heuristic is used to determine the resolved text direction of paragraphs. --> <attr name="textDirection" format="integer"> @@ -2099,6 +2100,29 @@ <!-- The paragraph direction is coming from the system Locale. --> <enum name="locale" value="5" /> </attr> + + <!-- Alignment of the text. A heuristic is used to determine the resolved + text alignment. --> + <attr name="textAlignment" format="integer"> + <!-- Default --> + <enum name="inherit" value="0" /> + <!-- Default for the root view. The gravity determines the alignment, ALIGN_NORMAL, + ALIGN_CENTER, or ALIGN_OPPOSITE, which are relative to each paragraph’s + text direction --> + <enum name="gravity" value="1" /> + <!-- Align to the start of the paragraph, e.g. ALIGN_NORMAL. --> + <enum name="textStart" value="2" /> + <!-- Align to the end of the paragraph, e.g. ALIGN_OPPOSITE. --> + <enum name="textEnd" value="3" /> + <!-- Center the paragraph, e.g. ALIGN_CENTER. --> + <enum name="center" value="4" /> + <!-- Align to the start of the view, which is ALIGN_LEFT if the view’s resolved + layoutDirection is LTR, and ALIGN_RIGHT otherwise. --> + <enum name="viewStart" value="5" /> + <!-- Align to the end of the view, which is ALIGN_RIGHT if the view’s resolved + layoutDirection is LTR, and ALIGN_LEFT otherwise --> + <enum name="viewEnd" value="6" /> + </attr> </declare-styleable> <!-- Attributes that can be used with a {@link android.view.ViewGroup} or any diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index e5f049d..7341c6c 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3554,6 +3554,7 @@ <public type="attr" name="supportsRtl" id="0x010103a8" /> <public type="attr" name="textDirection"/> + <public type="attr" name="textAlignment"/> <public type="attr" name="layoutDirection" /> |