Merge change I9a8a3d9d into eclair

* changes:
  Fix FastTrack recycling consistency issues, shadows.
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 78ab07e..0dcfc53 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -2723,7 +2723,9 @@
                 return 0;
             }
             int superCount = super.getCount();
-            if ((mMode & MODE_MASK_SHOW_NUMBER_OF_CONTACTS) != 0) {
+            if ((mMode & MODE_MASK_SHOW_NUMBER_OF_CONTACTS) != 0 && superCount > 0) {
+                // We don't want to count this header if it's the only thing visible, so that
+                // the empty text will display.
                 superCount++;
             }
             if (mSuggestionsCursorCount != 0) {