From ef2277ec5802143b8af1da32d7b01518401b97a9 Mon Sep 17 00:00:00 2001 From: Emma Sajic Date: Sun, 9 Dec 2012 13:32:05 +0000 Subject: [PATCH] Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter Fix for Issue ID 18316. Make isEmpty() return false when getCount() returns a non-zero value. So that the list cannot be considered empty when a header or footer is present. https://code.google.com/p/android/issues/detail?id=18316 Change-Id: Ib69201e9d5ef3efcbb68ea298b8cc8ca6e027246 Signed-off-by: Emma Sajic --- core/java/android/widget/HeaderViewListAdapter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/widget/HeaderViewListAdapter.java b/core/java/android/widget/HeaderViewListAdapter.java index e2a269ea13efb..0685e613c073c 100644 --- 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 infos) {