Merge "Bidi fixes for contact detail page"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b305245..ed35a21 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -58,6 +58,7 @@
android:icon="@mipmap/ic_launcher_contacts"
android:taskAffinity="android.task.contacts"
android:hardwareAccelerated="true"
+ android:supportsRtl="true"
>
<!-- The main Contacts activity with the contact list, favorites, and groups. -->
diff --git a/res/layout-sw580dp/detail_header_contact_with_updates.xml b/res/layout-sw580dp/detail_header_contact_with_updates.xml
index c515a76..06b82dd 100644
--- a/res/layout-sw580dp/detail_header_contact_with_updates.xml
+++ b/res/layout-sw580dp/detail_header_contact_with_updates.xml
@@ -49,15 +49,15 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="8dip"
- android:paddingRight="8dip">
+ android:paddingEnd="8dip" >
<TextView
android:id="@+id/name"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingLeft="8dip"
- android:paddingRight="24dip"
+ android:paddingStart="8dip"
+ android:paddingEnd="24dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="@dimen/detail_header_name_text_size" />
@@ -70,7 +70,7 @@
android:id="@+id/company"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary" />
diff --git a/res/layout-sw580dp/detail_header_contact_without_updates.xml b/res/layout-sw580dp/detail_header_contact_without_updates.xml
index f8f560d..069e0de 100644
--- a/res/layout-sw580dp/detail_header_contact_without_updates.xml
+++ b/res/layout-sw580dp/detail_header_contact_without_updates.xml
@@ -61,15 +61,15 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="8dip"
- android:paddingRight="8dip">
+ android:paddingEnd="8dip" >
<TextView
android:id="@+id/name"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingLeft="8dip"
- android:paddingRight="24dip"
+ android:paddingStart="8dip"
+ android:paddingEnd="24dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="@dimen/detail_header_name_text_size" />
@@ -82,7 +82,7 @@
android:id="@+id/company"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary" />
diff --git a/res/layout-sw680dp-land/detail_header_contact_with_updates.xml b/res/layout-sw680dp-land/detail_header_contact_with_updates.xml
index 7758a21..268b51a 100644
--- a/res/layout-sw680dp-land/detail_header_contact_with_updates.xml
+++ b/res/layout-sw680dp-land/detail_header_contact_with_updates.xml
@@ -36,8 +36,8 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
- android:paddingLeft="16dip"
- android:paddingRight="4dip">
+ android:paddingStart="16dip"
+ android:paddingEnd="4dip">
<TextView
android:id="@+id/name"
diff --git a/res/layout-sw680dp-land/detail_header_contact_without_updates.xml b/res/layout-sw680dp-land/detail_header_contact_without_updates.xml
index 9e53df0..bc3f16c 100644
--- a/res/layout-sw680dp-land/detail_header_contact_without_updates.xml
+++ b/res/layout-sw680dp-land/detail_header_contact_without_updates.xml
@@ -23,14 +23,14 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:paddingBottom="16dip"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="16dip">
+ android:paddingEnd="16dip">
<TextView
android:id="@+id/name"
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="@dimen/detail_header_name_text_size"
- android:paddingRight="16dip" />
+ android:paddingStart="16dip" />
<include
layout="@layout/favorites_star" />
diff --git a/res/layout/contact_detail_list_item.xml b/res/layout/contact_detail_list_item.xml
index 666b67c..a9d2f07 100644
--- a/res/layout/contact_detail_list_item.xml
+++ b/res/layout/contact_detail_list_item.xml
@@ -22,7 +22,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="16dip">
+ android:paddingStart="16dip">
<com.android.contacts.detail.ActionsViewContainer
android:id="@+id/actions_view_container"
@@ -41,14 +41,12 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
- android:paddingLeft="8dip"
- android:gravity="center_vertical">
+ android:paddingStart="8dip" >
<TextView
android:id="@+id/data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout
@@ -97,8 +95,8 @@
android:id="@+id/secondary_action_view_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="@dimen/detail_item_icon_margin"
- android:paddingRight="@dimen/detail_item_icon_margin"
+ android:paddingStart="@dimen/detail_item_icon_margin"
+ android:paddingEnd="@dimen/detail_item_icon_margin"
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:nextFocusLeft="@id/actions_view_container">
