commit 7a70738a3cd3a2519f504ff35607eb543a06d134
author Makoto Onuki <omakoto@google.com> Thu Nov 19 13:35:55 2009 +0900
committer Makoto Onuki <omakoto@google.com> Thu Nov 19 13:49:06 2009 +0900
tree 4e12af7cdd498618ca1d4104875865abad838a38
parent 16c364a557d619a0396ed35249478dcf2c1ffba5

ViewContactActivity: Don't show "No additional info..." while we're still loading data.

Fixes b/2195805.

src/com/android/contacts/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 909cf51..eb5aec5 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -154,6 +154,13 @@
     private ArrayList<Entity> mEntities = Lists.newArrayList();
     private HashMap<Long, DataStatus> mStatuses = Maps.newHashMap();
 
+    /**
+     * The view shown if the detail list is empty.
+     * We set this to the list view when first bind the adapter, so that it won't be shown while
+     * we're loading data.
+     */
+    private View mEmptyView;
+
     private ContentObserver mObserver = new ContentObserver(new Handler()) {
         @Override
         public boolean deliverSelfNotifications() {
@@ -209,7 +216,8 @@
         mListView.setOnCreateContextMenuListener(this);
         mListView.setScrollBarStyle(ListView.SCROLLBARS_OUTSIDE_OVERLAY);
         mListView.setOnItemClickListener(this);
-        mListView.setEmptyView((ScrollView) findViewById(android.R.id.empty));
+        // Don't set it to mListView yet.  We do so later when we bind the adapter.
+        mEmptyView = findViewById(android.R.id.empty);
 
         mResolver = getContentResolver();
 
@@ -437,6 +445,7 @@
         } else {
             mAdapter.setSections(mSections, SHOW_SEPARATORS);
         }
+        mListView.setEmptyView(mEmptyView);
     }
 
     @Override
@@ -902,7 +911,7 @@
                         entry.maxLines = 10;
                         try {
                             WebAddress webAddress = new WebAddress(entry.data);
-                            entry.intent = new Intent(Intent.ACTION_VIEW, 
+                            entry.intent = new Intent(Intent.ACTION_VIEW,
                                     Uri.parse(webAddress.toString()));
                         } catch (ParseException e) {
                             Log.e(TAG, "Couldn't parse website: " + entry.data);