From f85644637b808d6a88886e462c1f8fd5f53a6f2f Mon Sep 17 00:00:00 2001 From: linyuh Date: Thu, 31 May 2018 20:59:05 -0700 Subject: Solve BiDi problem when phone number is concatenated with RTL-string Solves BiDi problem that might cause phone number to be displayed incorrectly in the dialer. Issue might occur when a phone number is concatenated with a custom number label containing an RTL-string. Solved by changing affected labels from TextView to BidiTextView. Removed function spanDisplayNumber in BottomRow which are now obsolete. Updates the DialerBidiFormatter to prevent whitespace to be misplaced within a BidiTextView. BUG=78464687 TEST=Manual Public-Origin-Change-Id: I789a6f76a5ca805c03a437813ce627eef7a0bf2e Signed-off-by: Linyu He Author: Torbjorn Eklund Bug: 78464687 Test: Manual PiperOrigin-RevId: 198823629 Change-Id: Id35c3ebf514609b4a1fe10a7ae5a297bde7c7456 --- java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java | 2 +- java/com/android/dialer/calldetails/res/layout/contact_container.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 java/com/android/dialer/calldetails/res/layout/contact_container.xml (limited to 'java/com/android/dialer/calldetails') diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java index 4da7fa0dc..84a60c16e 100644 --- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java @@ -54,7 +54,7 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder private final CallDetailsHeaderListener callDetailsHeaderListener; private final ImageView callbackButton; private final BidiTextView nameView; - private final TextView numberView; + private final BidiTextView numberView; private final TextView networkView; private final QuickContactBadge contactPhoto; private final Context context; diff --git a/java/com/android/dialer/calldetails/res/layout/contact_container.xml b/java/com/android/dialer/calldetails/res/layout/contact_container.xml old mode 100644 new mode 100755 index e918feb69..4df81f152 --- a/java/com/android/dialer/calldetails/res/layout/contact_container.xml +++ b/java/com/android/dialer/calldetails/res/layout/contact_container.xml @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/photo_text_margin"/> -