commit 6c40fb564cb810eaae14548abff85d8871601c63
author Isaac Katzenelson <isaack@android.com> Wed Sep 14 10:11:11 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 14 10:11:11 2011 -0700
tree 39107dcbd3a2d4e478dba2222c333b9e9aabd8af
parent ef08857173f1aa79e6cd230eb644688534ec4960
parent 38458634f8e474786264050d3a1580e03a680fff

Merge "Fix quick contact icons accessibility issues"

src/com/android/contacts/quickcontact/ResolveCache.java

diff --git a/src/com/android/contacts/quickcontact/ResolveCache.java b/src/com/android/contacts/quickcontact/ResolveCache.java
index 71c4d0a..08a6cf8 100644
--- a/src/com/android/contacts/quickcontact/ResolveCache.java
+++ b/src/com/android/contacts/quickcontact/ResolveCache.java
@@ -184,10 +184,10 @@
     public CharSequence getDescription(Action action) {
         final CharSequence actionSubtitle = action.getSubtitle();
         final ResolveInfo info = getEntry(action).bestResolve;
-        if (!TextUtils.isEmpty(actionSubtitle)) {
-            return actionSubtitle;
-        } else if (info != null) {
+        if (info != null) {
             return info.loadLabel(mPackageManager);
+        } else if (!TextUtils.isEmpty(actionSubtitle)) {
+            return actionSubtitle;
         } else {
             return null;
         }