commit dc4beb483eb14f1b56154125c67b780802756572
author Adam Powell <adamp@android.com> Tue Dec 11 19:10:45 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 11 19:10:45 2012 -0800
tree 04cd0a5d938812970516d3ae5227580961dfead0
parent c6f05e93dc37db67addcd19ff87ba013ba817035
parent e7ec492f13355888c90b3f08fbc66e49dda7ed24

am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"

* commit 'e7ec492f13355888c90b3f08fbc66e49dda7ed24':
  Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter

core/java/android/widget/HeaderViewListAdapter.java

diff --git a/core/java/android/widget/HeaderViewListAdapter.java b/core/java/android/widget/HeaderViewListAdapter.java
index e2a269e..0685e61 100644
--- a/core/java/android/widget/HeaderViewListAdapter.java
+++ b/core/java/android/widget/HeaderViewListAdapter.java
@@ -79,7 +79,8 @@
     }
 
     public boolean isEmpty() {
-        return mAdapter == null || mAdapter.isEmpty();
+        return (mAdapter == null || mAdapter.isEmpty())
+	        && getFootersCount() + getHeadersCount() == 0;
     }
 
     private boolean areAllListInfosSelectable(ArrayList<ListView.FixedViewInfo> infos) {