commit b9256f81c0c65da98fb53b7d1879d71183d852b8
author Flavio Lerda <flerda@google.com> Sat Jul 09 20:10:57 2011 +0100
committer Flavio Lerda <flerda@google.com> Mon Jul 11 00:28:55 2011 +0100
tree 6b2b7e083e0d6156d0773bd5ee0bae773e7b3410
parent 175b381ab75bdff3c9a6504bec7b48ad5ba8d971

Use the correct number for display.

Also add a couple of final modifiers to make the flow clearer.

Change-Id: Id2a4b1508f1202da0e411df194e38808d8d7c1a8

src/com/android/contacts/PhoneCallDetailsHelper.java

diff --git a/src/com/android/contacts/PhoneCallDetailsHelper.java b/src/com/android/contacts/PhoneCallDetailsHelper.java
index 78ca252..72ab6cb 100644
--- a/src/com/android/contacts/PhoneCallDetailsHelper.java
+++ b/src/com/android/contacts/PhoneCallDetailsHelper.java
@@ -112,19 +112,21 @@
             numberFormattedLabel = Phone.getTypeLabel(mResources, numberType, numberLabel);
         }
 
-        CharSequence nameText;
-        CharSequence numberText;
+        final CharSequence nameText;
+        final CharSequence numberText;
         if (TextUtils.isEmpty(name)) {
             nameText = getDisplayNumber(number);
             numberText = "";
         } else {
             nameText = name;
-            numberText = getDisplayNumber(number);
+            CharSequence displayNumber = getDisplayNumber(number);
             if (callType != 0 && numberFormattedLabel != null) {
                 numberText = FormatUtils.applyStyleToSpan(Typeface.BOLD,
-                        numberFormattedLabel + " " + number, 0,
+                        numberFormattedLabel + " " + displayNumber, 0,
                         numberFormattedLabel.length(),
                         Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            } else {
+                numberText = displayNumber;
             }
         }