commit b5b6535dcaefd3d07906b4aca408c2f72f9f6b30
author Dmitri Plotnikov <dplotnikov@google.com> Tue Mar 09 17:56:25 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Tue Mar 09 17:56:25 2010 -0800
tree 4d6ec7ef4feb634aab4b1005f1f152c5717fa023
parent 7fa5bb3948c58e1b539bd12d8a9ab9977024dc1d

Fixing initial message displayed in Contacts.

Bug: 2501713
Change-Id: I20cdc2907caf06ba272f645cd95036bfe1072b5f

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index a9da8bc..dbb79fb 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -440,6 +440,8 @@
     private static final int QUERY_MODE_MAILTO = 1;
     private static final int QUERY_MODE_TEL = 2;
 
+    private boolean mProviderStatusNormal;
+
     private boolean mSearchMode;
     private boolean mShowNumberOfContacts;
 
@@ -934,7 +936,7 @@
 
     private void setEmptyText() {
         TextView empty = (TextView) findViewById(R.id.emptyText);
-        if (mMode == MODE_JOIN_CONTACT || mSearchMode || mAdapter.getCursor() == null) {
+        if (mMode == MODE_JOIN_CONTACT || mSearchMode) {
             empty.setText(null);
             return;
         }
@@ -1039,12 +1041,14 @@
                 int status = cursor.getInt(0);
                 switch (status) {
                     case ProviderStatus.STATUS_NORMAL:
+                        mProviderStatusNormal = true;
                         if (loadData) {
                             startQuery();
                         }
                         return true;
 
                     case ProviderStatus.STATUS_CHANGING_LOCALE:
+                        mProviderStatusNormal = false;
                         TextView empty = (TextView) findViewById(R.id.emptyText);
                         empty.setText(R.string.locale_change_in_progress);
                         mAdapter.changeCursor(null);
@@ -2725,7 +2729,7 @@
 
         @Override
         public boolean isEmpty() {
-            if (!mDataValid) {
+            if (!mProviderStatusNormal) {
                 return true;
             }