summaryrefslogtreecommitdiffstats
path: root/chips
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2014-03-05 02:24:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-05 02:24:35 +0000
commit8eb56a43fdb583f32b960b8d092a403959a17fcb (patch)
tree23303490abeedd2de8d1e93e115297d8c2e4b148 /chips
parent57b5b6fa3d794c0ea1f517afefa871a2a32aa561 (diff)
parentae908d2985da811f8285314ad995390a8cfeecaf (diff)
downloadandroid_frameworks_ex-8eb56a43fdb583f32b960b8d092a403959a17fcb.tar.gz
android_frameworks_ex-8eb56a43fdb583f32b960b8d092a403959a17fcb.tar.bz2
android_frameworks_ex-8eb56a43fdb583f32b960b8d092a403959a17fcb.zip
am ae908d29: RTL - properly set text alignment and direction.
* commit 'ae908d2985da811f8285314ad995390a8cfeecaf': RTL - properly set text alignment and direction.
Diffstat (limited to 'chips')
-rw-r--r--chips/res/values-sw600dp/styles.xml5
-rw-r--r--chips/res/values/styles.xml5
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">