Merge "Fix photo alignment in RTL locales in ContactEntryListAdapter"
diff --git a/res/layout/contact_tile_frequent.xml b/res/layout/contact_tile_frequent.xml
index 494fd3d..0355929 100644
--- a/res/layout/contact_tile_frequent.xml
+++ b/res/layout/contact_tile_frequent.xml
@@ -28,7 +28,7 @@
android:id="@+id/contact_tile_quick"
android:layout_width="64dip"
android:layout_height="64dip"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:scaleType="centerCrop"
android:focusable="true" />
@@ -38,12 +38,12 @@
android:orientation="vertical"
android:layout_alignParentBottom="true"
android:gravity="center_vertical"
- android:paddingRight="80dip"
- android:paddingLeft="8dip">
+ android:paddingEnd="80dip"
+ android:paddingStart="8dip">
<TextView
android:id="@+id/contact_tile_name"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/primary_text_color"
android:textSize="18sp"
diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index 89a67d5..67d8030 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -463,6 +463,10 @@
int leftBound = getPaddingLeft();
int rightBound = width - getPaddingRight();
+ if (isLayoutRtl()) {
+ mPhotoPosition = PhotoPosition.LEFT;
+ }
+
// Put the header in the top of the contact view (Text + underline view)
if (mHeaderVisible) {
mHeaderTextView.layout(leftBound + mHeaderTextIndent,