diff options
author | Yorke Lee <yorkelee@google.com> | 2013-09-03 18:35:29 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2013-09-04 07:09:43 -0700 |
commit | c4bacb09c398a615154dc97b066179e77dc57599 (patch) | |
tree | 8f4a51cc04f3a2c3f6381a82c0636ea2469385be /InCallUI | |
parent | fa147f1bdac9bfe3befbbfaa2a657cc4498c1da9 (diff) |
Fix secondary call card in rtl
Bug: 10541171
Change-Id: Ia63b6c5f1ce12ffe0a253d10a92470bbd1e7539e
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 11 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 15 |
2 files changed, 19 insertions, 7 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index bf3c42c73..486b083f9 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -202,12 +202,19 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } @Override - public void setSecondary(boolean show, String name, String label, Drawable photo) { + public void setSecondary(boolean show, String name, boolean nameIsNumber, String label, + Drawable photo) { if (show) { showAndInitializeSecondaryCallInfo(); - mSecondaryCallName.setText(name); + + int nameDirection = View.TEXT_DIRECTION_INHERIT; + if (nameIsNumber) { + nameDirection = View.TEXT_DIRECTION_LTR; + } + mSecondaryCallName.setTextDirection(nameDirection); + setDrawableToImageView(mSecondaryPhoto, photo); } else { mSecondaryCallInfo.setVisibility(View.GONE); diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 5b6520d7c..42dfb8e5e 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -21,6 +21,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.graphics.Bitmap; +import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.text.format.DateUtils; @@ -368,11 +369,15 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> if (mSecondaryContactInfo != null) { Log.d(TAG, "updateSecondaryDisplayInfo() " + mSecondaryContactInfo); - ui.setSecondary(true, getNameForCall(mSecondaryContactInfo), - mSecondaryContactInfo.label, mSecondaryContactInfo.photo); + final String nameForCall = getNameForCall(mSecondaryContactInfo); + + final boolean nameIsNumber = nameForCall != null && nameForCall.equals( + mSecondaryContactInfo.number); + ui.setSecondary(true, nameForCall, nameIsNumber, mSecondaryContactInfo.label, + mSecondaryContactInfo.photo); } else { // reset to nothing so that it starts off blank next time we use it. - ui.setSecondary(false, null, null, null); + ui.setSecondary(false, null, false, null, null); } } @@ -490,10 +495,10 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> void setVisible(boolean on); void setPrimary(String number, String name, boolean nameIsNumber, String label, Drawable photo, boolean isConference, String gatewayLabel, String gatewayNumber); - void setSecondary(boolean show, String name, String label, Drawable photo); + void setSecondary(boolean show, String name, boolean nameIsNumber, String label, + Drawable photo); void setSecondaryImage(Bitmap bitmap); void setCallState(int state, Call.DisconnectCause cause, boolean bluetoothOn); - void setPrimaryCallElapsedTime(boolean show, String duration); void setPrimaryName(String name, boolean nameIsNumber); void setPrimaryImage(Bitmap bitmap); |