commit 371d5f97d0b87ea0c9d8e8e178c04df34336a29e
author Flavio Lerda <flerda@google.com> Sat Jul 09 19:45:32 2011 +0100
committer Flavio Lerda <flerda@google.com> Mon Jul 11 00:28:55 2011 +0100
tree 48a6a1bab704bf7df713ee110e27deba499ebaaa
parent 4586febe3637303ab6f1b24fc5a23750aa3a6259

Update the formatting of call log entries.

Use the three line style that is also used in the details view, in fact,
reuse the helper class and layout from that class.

Fix a few cases that were correctly handled by the call log list but not
by the details view.

Change-Id: I32e6516a571d6e3d95b5f0e414a4fc711cb6a51b

src/com/android/contacts/PhoneCallDetailsHelper.java

diff --git a/src/com/android/contacts/PhoneCallDetailsHelper.java b/src/com/android/contacts/PhoneCallDetailsHelper.java
index b52dacb..4605799 100644
--- a/src/com/android/contacts/PhoneCallDetailsHelper.java
+++ b/src/com/android/contacts/PhoneCallDetailsHelper.java
@@ -162,11 +162,11 @@
         final CharSequence nameText;
         final CharSequence numberText;
         if (TextUtils.isEmpty(details.name)) {
-            nameText = getDisplayNumber(details.number);
+            nameText = getDisplayNumber(details.number, details.formattedNumber);
             numberText = "";
         } else {
             nameText = details.name;
-            CharSequence displayNumber = getDisplayNumber(details.number);
+            CharSequence displayNumber = getDisplayNumber(details.number, details.formattedNumber);
             if (details.callType != 0 && numberFormattedLabel != null) {
                 numberText = FormatUtils.applyStyleToSpan(Typeface.BOLD,
                         numberFormattedLabel + " " + displayNumber, 0,
@@ -191,7 +191,7 @@
         }
     }
 
-    private CharSequence getDisplayNumber(CharSequence number) {
+    private CharSequence getDisplayNumber(CharSequence number, CharSequence formattedNumber) {
         if (TextUtils.isEmpty(number)) {
             return "";
         }
@@ -207,7 +207,11 @@
         if (PhoneNumberUtils.extractNetworkPortion(number.toString()).equals(mVoicemailNumber)) {
             return mResources.getString(R.string.voicemail);
         }
-        return number;
+        if (TextUtils.isEmpty(formattedNumber)) {
+            return number;
+        } else {
+            return formattedNumber;
+        }
     }
 
     public void setCurrentTimeForTest(long currentTimeMillis) {