Dialer:E-call time does not display properly
-Emergency number + number display as a number in ECM,which it is
too big to hide number when singleLine is true. if not, it will
shelter emergency call timer.
-To format name and number in ECM seprately.
Change-Id: I54101dee2637a72b2947b1b4bef8fade38d298b8
CRs-Fixed: 1028096
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index cf2b18e..35b00a0 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -618,9 +618,6 @@
// Set direction of the name field
int nameDirection = View.TEXT_DIRECTION_INHERIT;
if (nameIsNumber) {
- if (PhoneNumberUtils.isEmergencyNumber(name)) {
- mPrimaryName.setSingleLine(false);
- }
nameDirection = View.TEXT_DIRECTION_LTR;
}
mPrimaryName.setTextDirection(nameDirection);
diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java
index db1b864..ccee604 100644
--- a/InCallUI/src/com/android/incallui/CallerInfo.java
+++ b/InCallUI/src/com/android/incallui/CallerInfo.java
@@ -404,9 +404,8 @@
/* package */ CallerInfo markAsEmergency(Context context, String number) {
number = PhoneNumberUtils.normalizeNumber(number);
- name = context.getString(R.string.emergency_call_dialog_number_for_display) + " "
- + number;
- phoneNumber = null;
+ name = context.getString(R.string.emergency_call_dialog_number_for_display);
+ phoneNumber = number;
photoResource = R.drawable.img_phone;
mIsEmergency = true;