diff options
| author | Adam Powell <adamp@android.com> | 2012-12-11 19:12:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-11 19:12:45 -0800 |
| commit | 2331b42328fcdd54d3b26152f998554c610ae1b4 (patch) | |
| tree | e337d4162fd2c137d5585e21fcf6d1c231d88b7c | |
| parent | 90f4c5c9d440a7802ecdb6c99fe7cac589122b17 (diff) | |
| parent | dc4beb483eb14f1b56154125c67b780802756572 (diff) | |
| download | frameworks_base-2331b42328fcdd54d3b26152f998554c610ae1b4.zip frameworks_base-2331b42328fcdd54d3b26152f998554c610ae1b4.tar.gz frameworks_base-2331b42328fcdd54d3b26152f998554c610ae1b4.tar.bz2 | |
am dc4beb48: am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
* commit 'dc4beb483eb14f1b56154125c67b780802756572':
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) { |