diff options
| author | Adam Powell <adamp@android.com> | 2012-12-11 18:00:48 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-11 18:00:49 -0800 |
| commit | e7ec492f13355888c90b3f08fbc66e49dda7ed24 (patch) | |
| tree | 1757eb72f0a9297fb26a687c1d0b5badddd3a398 | |
| parent | d22843a8a8d240fc09291b1b9505d62c1f0c0f8d (diff) | |
| parent | ef2277ec5802143b8af1da32d7b01518401b97a9 (diff) | |
| download | frameworks_base-e7ec492f13355888c90b3f08fbc66e49dda7ed24.zip frameworks_base-e7ec492f13355888c90b3f08fbc66e49dda7ed24.tar.gz frameworks_base-e7ec492f13355888c90b3f08fbc66e49dda7ed24.tar.bz2 | |
Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
| -rw-r--r-- | core/java/android/widget/HeaderViewListAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 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) { |