summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-02-05 16:25:54 -0800
committerYorke Lee <yorkelee@google.com>2013-02-06 10:14:07 -0800
commit09f15e70e86d92ae0f4c15a726b777f170845a3c (patch)
tree796a653f65e6f895b76634b1d809e3d7e199c0d7
parent97020718356ec59704e618d38510c4d78638d4e1 (diff)
downloadpackages_apps_ContactsCommon-09f15e70e86d92ae0f4c15a726b777f170845a3c.tar.gz
packages_apps_ContactsCommon-09f15e70e86d92ae0f4c15a726b777f170845a3c.tar.bz2
packages_apps_ContactsCommon-09f15e70e86d92ae0f4c15a726b777f170845a3c.zip
Fix photo alignment in RTL locales in ContactEntryListAdapter
Bug: 5590280 Change-Id: I17caf1d17b9b5ccac177e66d8b4e5605e0ac6be1
-rw-r--r--res/layout/contact_tile_frequent.xml8
-rw-r--r--src/com/android/contacts/common/list/ContactListItemView.java4
2 files changed, 8 insertions, 4 deletions
diff --git a/res/layout/contact_tile_frequent.xml b/res/layout/contact_tile_frequent.xml
index 494fd3d8..03559297 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 89a67d58..67d80302 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -463,6 +463,10 @@ public class ContactListItemView extends ViewGroup
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,