summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2013-04-05 21:17:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-05 21:17:26 +0000
commit45f2171aed0a2abebd54003cb8f307aa8cf251f5 (patch)
treed248c05363c626b83de259209be7b0969919e369 /src
parentf43f537a0100693570606c436a81a12e21fb5b9e (diff)
parentc341db0532d8b60ca29aa0becf05a4eec9bdc43e (diff)
Merge "Fix for bug #8146846 Phone App should be mirrored for RTL languages" into jb-mr2-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/DialtactsActivity.java3
-rw-r--r--src/com/android/dialer/PhoneCallDetailsHelper.java4
-rw-r--r--src/com/android/dialer/list/PhoneFavoriteFragment.java6
3 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 2557ebc3e..32339d2cf 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -680,7 +680,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
mSearchFragment.setOnPhoneNumberPickerActionListener(mPhoneNumberPickerActionListener);
mSearchFragment.setQuickContactEnabled(true);
mSearchFragment.setDarkTheme(true);
- mSearchFragment.setPhotoPosition(ContactListItemView.PhotoPosition.LEFT);
+ mSearchFragment.setPhotoPosition(ContactListItemView.getDefaultPhotoPosition(
+ true /* opposite */));
mSearchFragment.setUseCallableUri(true);
if (mContactListFilterController != null
&& mContactListFilterController.getFilter() != null) {
diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java
index f8ca769fc..51b110910 100644
--- a/src/com/android/dialer/PhoneCallDetailsHelper.java
+++ b/src/com/android/dialer/PhoneCallDetailsHelper.java
@@ -115,10 +115,14 @@ public class PhoneCallDetailsHelper {
numberText = details.geocode;
}
labelText = null;
+ // We have a real phone number as "nameView" so make it always LTR
+ views.nameView.setTextDirection(View.TEXT_DIRECTION_LTR);
} else {
nameText = details.name;
numberText = displayNumber;
labelText = numberFormattedLabel;
+ // We have a real phone number as "numberView" so make it always LTR
+ views.numberView.setTextDirection(View.TEXT_DIRECTION_LTR);
}
views.nameView.setText(nameText);
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 93f38bb75..97481bc35 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -301,8 +301,10 @@ public class PhoneFavoriteFragment extends Fragment implements OnItemClickListen
mAllContactsAdapter.setSectionHeaderDisplayEnabled(true);
// Disable pinned header. It doesn't work with this fragment.
mAllContactsAdapter.setPinnedPartitionHeadersEnabled(false);
- // Put photos on left for consistency with "frequent" contacts section.
- mAllContactsAdapter.setPhotoPosition(ContactListItemView.PhotoPosition.LEFT);
+ // Put photos on START (LEFT in LTR layout direction and RIGHT in RTL layout direction)
+ // for consistency with "frequent" contacts section.
+ mAllContactsAdapter.setPhotoPosition(ContactListItemView.getDefaultPhotoPosition(
+ true /* opposite */ ));
// Use Callable.CONTENT_URI which will include not only phone numbers but also SIP
// addresses.