diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-03-05 22:33:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 22:33:21 +0000 |
| commit | 4b868ed83ce7db6f6a9f65f6d2bd020ea5f32c8b (patch) | |
| tree | 7c418c56fa5438a53361e3ccaa108d705f7ed507 /chips | |
| parent | 30df46f9e6794df82ad5f762416d6e7fb8e71b89 (diff) | |
| parent | 27df5a3a62ccd4c7e3621c321bb0f39337b75e29 (diff) | |
| download | android_frameworks_ex-4b868ed83ce7db6f6a9f65f6d2bd020ea5f32c8b.tar.gz android_frameworks_ex-4b868ed83ce7db6f6a9f65f6d2bd020ea5f32c8b.tar.bz2 android_frameworks_ex-4b868ed83ce7db6f6a9f65f6d2bd020ea5f32c8b.zip | |
am 27df5a3a: am 099915f7: am ebf46bcd: am 8eb56a43: am ae908d29: RTL - properly set text alignment and direction.
* commit '27df5a3a62ccd4c7e3621c321bb0f39337b75e29':
RTL - properly set text alignment and direction.
Diffstat (limited to 'chips')
| -rw-r--r-- | chips/res/values-sw600dp/styles.xml | 5 | ||||
| -rw-r--r-- | chips/res/values/styles.xml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chips/res/values-sw600dp/styles.xml b/chips/res/values-sw600dp/styles.xml index b6014ea..00988a9 100644 --- a/chips/res/values-sw600dp/styles.xml +++ b/chips/res/values-sw600dp/styles.xml @@ -13,7 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> +<resources xmlns:tools="http://schemas.android.com/tools" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <style name="RecipientEditTextView" parent="@android:attr/autoCompleteTextViewStyle"> <item name="android:paddingLeft">8dip</item> <item name="android:paddingRight">4dip</item> @@ -25,5 +26,7 @@ <item name="android:layout_width">match_parent</item> <item name="android:dropDownVerticalOffset">0dip</item> <item name="android:dropDownHorizontalOffset">-4dip</item> + <item name="android:textAlignment" tools:ignore="NewApi">viewStart</item> + <item name="android:textDirection" tools:ignore="NewApi">locale</item> </style> </resources> diff --git a/chips/res/values/styles.xml b/chips/res/values/styles.xml index 83f96b4..9b60cde 100644 --- a/chips/res/values/styles.xml +++ b/chips/res/values/styles.xml @@ -13,7 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> +<resources xmlns:tools="http://schemas.android.com/tools" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <style name="RecipientEditTextView" parent="@android:attr/autoCompleteTextViewStyle"> <item name="android:inputType">textEmailAddress|textMultiLine</item> <item name="android:imeOptions">actionNext|flagNoFullscreen</item> @@ -25,6 +26,8 @@ <item name="android:dropDownHorizontalOffset">-16dip</item> <item name="android:minHeight">48dip</item> <item name="android:lineSpacingExtra">@dimen/line_spacing_extra</item> + <item name="android:textAlignment" tools:ignore="NewApi">viewStart</item> + <item name="android:textDirection" tools:ignore="NewApi">locale</item> </style> <style name="ChipTitleStyle"> |