commit fb316f6643af75d2e45a3f983d0c24144ead35b3
author Andrew Sapperstein <asapperstein@google.com> Wed Mar 05 02:24:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 05 02:24:35 2014 +0000
tree 8d36bd83cda80c20f1cac6999505e25d8dc8e84e
parent 570a321ef075a412ca84d8443754799976b22821
parent 94ea53435b2bdc5dc6929848bfab485792a8dcdb

am ae908d29: RTL - properly set text alignment and direction.

* commit 'ae908d2985da811f8285314ad995390a8cfeecaf':
  RTL - properly set text alignment and direction.

res/values-sw600dp/styles.xml

diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index b6014ea..00988a9 100644
--- a/res/values-sw600dp/styles.xml
+++ b/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>

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 83f96b4..9b60cde 100644
--- a/res/values/styles.xml
+++ b/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">