commit 47edff11274d01c26a0d7ac39ccf76bce3298a6f
author Dmitri Plotnikov <dplotnikov@google.com> Tue Sep 22 18:28:18 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Tue Sep 22 18:28:26 2009 -0700
tree edea11ef9cde74e39fa6894b0dced787d4954e5b
parent 039a2aabee31d054b4f14a7f2e1cfa5ffd2be93d

[Issue 2099417] Contact list now shows presence dots

Change-Id: I2d8fb3af86a2e11d3c6d53c7b9e66efcf96038d5

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 27aee19..79af879 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -2374,10 +2374,25 @@
                 }
             }
 
+            ImageView presenceView = cache.presenceView;
+            if ((mMode & MODE_MASK_NO_PRESENCE) == 0) {
+                // Set the proper icon (star or presence or nothing)
+                int serverStatus;
+                if (!cursor.isNull(SUMMARY_PRESENCE_STATUS_COLUMN_INDEX)) {
+                    serverStatus = cursor.getInt(SUMMARY_PRESENCE_STATUS_COLUMN_INDEX);
+                    presenceView.setImageResource(
+                            Presence.getPresenceIconResourceId(serverStatus));
+                    presenceView.setVisibility(View.VISIBLE);
+                } else {
+                    presenceView.setVisibility(View.GONE);
+                }
+            } else {
+                presenceView.setVisibility(View.GONE);
+            }
+
             if (!displayAdditionalData) {
                 cache.dataView.setVisibility(View.GONE);
                 cache.labelView.setVisibility(View.GONE);
-                cache.presenceView.setVisibility(View.GONE);
                 return;
             }
 
@@ -2409,23 +2424,6 @@
                 // There is no label, hide the the view
                 labelView.setVisibility(View.GONE);
             }
-
-            // Set the proper icon (star or presence or nothing)
-            ImageView presenceView = cache.presenceView;
-            if ((mMode & MODE_MASK_NO_PRESENCE) == 0) {
-                int serverStatus;
-                if (!cursor.isNull(SUMMARY_PRESENCE_STATUS_COLUMN_INDEX)) {
-                    serverStatus = cursor.getInt(SUMMARY_PRESENCE_STATUS_COLUMN_INDEX);
-                    presenceView.setImageResource(
-                            Presence.getPresenceIconResourceId(serverStatus));
-                    presenceView.setVisibility(View.VISIBLE);
-                } else {
-                    presenceView.setVisibility(View.GONE);
-                }
-            } else {
-                presenceView.setVisibility(View.GONE);
-            }
-
         }
 
         private void bindSectionHeader(View view, int position, boolean displaySectionHeaders) {