Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"

2012-12-11 18:00:48 -08:00
parent d22843a8a8 ef2277ec58
commit e7ec492f13
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/widget/HeaderViewListAdapter.java
+++ b/core/java/android/widget/HeaderViewListAdapter.java
@@ -79,7 +79,8 @@ public class HeaderViewListAdapter implements WrapperListAdapter, Filterable {
    }

    public boolean isEmpty() {
-        return mAdapter == null || mAdapter.isEmpty();
+        return (mAdapter == null || mAdapter.isEmpty())
+	        && getFootersCount() + getHeadersCount() == 0;
    }

    private boolean areAllListInfosSelectable(ArrayList<ListView.FixedViewInfo> infos) {