Merge "Fix alignment bugs for Contacts UI on RTL languages." into ub-contactsdialer-a-dev am: 5378307da7
am: b4d5be5b9f
* commit 'b4d5be5b9f1d9c26a39f0aaed7cd7ab2324cfd20':
Fix alignment bugs for Contacts UI on RTL languages.
diff --git a/res/layout/compact_account_info.xml b/res/layout/compact_account_info.xml
index 95fced2..dda4fe4 100644
--- a/res/layout/compact_account_info.xml
+++ b/res/layout/compact_account_info.xml
@@ -51,6 +51,7 @@
android:singleLine="true"
android:textColor="@color/primary_text_color"
android:ellipsize="end"
+ android:textAlignment="viewStart"
/>
<TextView
diff --git a/res/layout/compact_contact_editor_fields.xml b/res/layout/compact_contact_editor_fields.xml
index a4f0613..6dbd2c3 100644
--- a/res/layout/compact_contact_editor_fields.xml
+++ b/res/layout/compact_contact_editor_fields.xml
@@ -41,6 +41,7 @@
android:paddingStart="72dp"
android:gravity="center_vertical"
android:text="@string/compact_editor_more_fields"
+ android:textAlignment="viewStart"
android:textColor="?android:attr/colorAccent"
android:textSize="@dimen/expanding_entry_card_title_text_size"/>
diff --git a/res/layout/edit_simple_spinner_item.xml b/res/layout/edit_simple_spinner_item.xml
index 6b78dac..35b5ab4 100644
--- a/res/layout/edit_simple_spinner_item.xml
+++ b/res/layout/edit_simple_spinner_item.xml
@@ -27,4 +27,5 @@
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:maxLines="1"
+ android:textAlignment="viewStart"
android:ellipsize="end" />
\ No newline at end of file
diff --git a/res/layout/editor_account_header_expandable.xml b/res/layout/editor_account_header_expandable.xml
index 2636f9c..c3d9e31 100644
--- a/res/layout/editor_account_header_expandable.xml
+++ b/res/layout/editor_account_header_expandable.xml
@@ -52,6 +52,7 @@
android:singleLine="true"
android:textColor="@color/primary_text_color"
android:ellipsize="end"
+ android:textAlignment="viewStart"
/>
<TextView
@@ -62,6 +63,7 @@
android:singleLine="true"
android:textColor="@color/secondary_text_color"
android:ellipsize="end"
+ android:textAlignment="viewStart"
/>
</LinearLayout>
diff --git a/res/layout/editor_all_rawcontacts_accounts_selector.xml b/res/layout/editor_all_rawcontacts_accounts_selector.xml
index f1cbc48..c830d38 100644
--- a/res/layout/editor_all_rawcontacts_accounts_selector.xml
+++ b/res/layout/editor_all_rawcontacts_accounts_selector.xml
@@ -39,6 +39,7 @@
android:singleLine="true"
android:layout_weight="1"
android:textColor="@color/primary_text_color"
+ android:textAlignment="viewStart"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:ellipsize="end" />
diff --git a/res/layout/item_read_only_field.xml b/res/layout/item_read_only_field.xml
index ec75e1a..3195b4c 100644
--- a/res/layout/item_read_only_field.xml
+++ b/res/layout/item_read_only_field.xml
@@ -41,6 +41,7 @@
android:textColor="?android:attr/textColorSecondary"
android:singleLine="true"
android:saveEnabled="false"
+ android:textAlignment="viewStart"
android:enabled="false"/>
<TextView
@@ -51,6 +52,7 @@
android:textColor="?android:attr/textColorSecondary"
android:singleLine="true"
android:saveEnabled="false"
+ android:textAlignment="viewStart"
android:enabled="false"/>
</LinearLayout>
diff --git a/res/layout/quickcontact_collapsed_suggestion_card.xml b/res/layout/quickcontact_collapsed_suggestion_card.xml
index bf8c97d..45de7f5 100644
--- a/res/layout/quickcontact_collapsed_suggestion_card.xml
+++ b/res/layout/quickcontact_collapsed_suggestion_card.xml
@@ -45,6 +45,7 @@
android:textColor="@color/quickcontact_entry_header_text_color"
android:singleLine="true"
android:ellipsize="end"
+ android:textAlignment="viewStart"
android:paddingTop="@dimen/quickcontact_collapse_text_padding"/>
<ImageView
diff --git a/res/layout/quickcontact_expand_suggestion_card.xml b/res/layout/quickcontact_expand_suggestion_card.xml
index 9c19efc..7b27c86 100644
--- a/res/layout/quickcontact_expand_suggestion_card.xml
+++ b/res/layout/quickcontact_expand_suggestion_card.xml
@@ -39,6 +39,7 @@
android:textColor="@color/quickcontact_entry_header_text_color"
android:singleLine="true"
android:ellipsize="end"
+ android:textAlignment="viewStart"
android:paddingTop="@dimen/quickcontact_suggestion_card_image_spacing"
android:paddingBottom="@dimen/quickcontact_suggestion_card_image_spacing"
android:paddingStart="@dimen/quickcontact_suggestion_card_image_spacing"/>
@@ -51,6 +52,7 @@
android:layout_height="wrap_content"
android:textColor="@color/quickcontact_entry_header_text_color"
android:lineSpacingMultiplier="1.2"
+ android:textAlignment="viewStart"
android:paddingBottom="@dimen/quickcontact_suggestion_card_image_spacing"
android:paddingStart="@dimen/quickcontact_suggestion_card_image_spacing"
android:paddingEnd="@dimen/quickcontact_suggestion_card_image_spacing"/>
@@ -64,6 +66,7 @@
android:textColor="@color/quickcontact_entry_sub_header_text_color"
android:singleLine="true"
android:ellipsize="end"
+ android:textAlignment="viewStart"
android:paddingStart="@dimen/quickcontact_suggestion_card_image_spacing"/>
<LinearLayout
@@ -121,6 +124,7 @@
android:textColor="@color/quickcontact_entry_sub_header_text_color"
android:singleLine="true"
android:ellipsize="end"
+ android:textAlignment="viewStart"
android:paddingStart="@dimen/quickcontact_suggestion_card_image_spacing"/>
<LinearLayout
diff --git a/res/layout/raw_contact_readonly_editor_view.xml b/res/layout/raw_contact_readonly_editor_view.xml
index 99ed236..25699ce 100644
--- a/res/layout/raw_contact_readonly_editor_view.xml
+++ b/res/layout/raw_contact_readonly_editor_view.xml
@@ -50,9 +50,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/editor_delete_button_width"
+ android:layout_marginEnd="@dimen/editor_delete_button_width"
android:singleLine="true"
android:textSize="@dimen/editor_form_text_size"
android:textColor="?android:attr/textColorSecondary"
+ android:textAlignment="viewStart"
android:enabled="false"/>
</LinearLayout>