commit b7a90197cc3f3c248b398dc46b2bce04c1bf3b05
author Flavio Lerda <flerda@google.com> Mon Jun 06 11:58:05 2011 +0100
committer Flavio Lerda <flerda@google.com> Mon Jun 06 11:59:52 2011 +0100
tree 49e4abf06fc4395ca5dd574d5898d7dff5b25b54
parent d346edefcff32b59c3827e50057279b72de99d98

Use getTypeLabel instead of getDisplayLabel.

Phone.getDisplayLabel is deprecated and it is currently implemented by
ignoring the label array.

Change-Id: I3e5e41f554c0a76d90af398cfef6f65cb0e01507

src/com/android/contacts/calllog/CallLogFragment.java

diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java
index 961c134..13d2e6c 100644
--- a/src/com/android/contacts/calllog/CallLogFragment.java
+++ b/src/com/android/contacts/calllog/CallLogFragment.java
@@ -188,8 +188,6 @@
         private boolean mFirst;
         private Thread mCallerIdThread;
 
-        private CharSequence[] mLabelArray;
-
         private Drawable mDrawableIncoming;
         private Drawable mDrawableOutgoing;
         private Drawable mDrawableMissed;
@@ -253,7 +251,6 @@
                     R.drawable.ic_call_log_list_outgoing_call);
             mDrawableMissed = getResources().getDrawable(
                     R.drawable.ic_call_log_list_missed_call);
-            mLabelArray = getResources().getTextArray(com.android.internal.R.array.phoneTypes);
         }
 
         /**
@@ -692,8 +689,7 @@
                 // "type" and "label" are currently unused for SIP addresses.
                 CharSequence numberLabel = null;
                 if (!PhoneNumberUtils.isUriNumber(number)) {
-                    numberLabel = Phone.getDisplayLabel(context, ntype, label,
-                            mLabelArray);
+                    numberLabel = Phone.getTypeLabel(getResources(), ntype, label);
                 }
                 views.numberView.setVisibility(View.VISIBLE);
                 views.numberView.setText(formattedNumber);