summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dave Burke <daveburke@google.com> 2013-06-12 21:11:12 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-06-12 21:11:12 -0700
commitbafc8dcf690776ec7fdcf26518f3aff47724871d (patch)
tree241c5a79ec82fef604be9b5b1507944cd7bbfb75
parent40609ff0fdcbebc6bd86fca3bcf81293dd59fb74 (diff)
parent34bc73dff1f0c8402da3fc9bd1f0175bddcaa842 (diff)
am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev
* commit '34bc73dff1f0c8402da3fc9bd1f0175bddcaa842': Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
-rw-r--r--core/java/android/widget/HeaderViewListAdapter.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/widget/HeaderViewListAdapter.java b/core/java/android/widget/HeaderViewListAdapter.java
index 222f1089ddf6..f9d8f920f883 100644
--- a/core/java/android/widget/HeaderViewListAdapter.java
+++ b/core/java/android/widget/HeaderViewListAdapter.java
@@ -79,8 +79,7 @@ public class HeaderViewListAdapter implements WrapperListAdapter, Filterable {
}
public boolean isEmpty() {
- return (mAdapter == null || mAdapter.isEmpty())
- && getFootersCount() + getHeadersCount() == 0;
+ return mAdapter == null || mAdapter.isEmpty();
}
private boolean areAllListInfosSelectable(ArrayList<ListView.FixedViewInfo> infos) {