Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automated import from //branches/master/...@140745,140745

Browse Source
This commit is contained in:
Romain Guy
2009-03-24 18:23:21 -07:00
committed by The Android Open Source Project
parent 1c9aefd471
commit dace7ff271
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/widget/ListView.java
View File

@@ -2769,6 +2769,8 @@ public class ListView extends AbsListView {
final boolean headerDividers = mHeaderDividersEnabled;
final boolean footerDividers = mFooterDividersEnabled;
final int first = mFirstPosition;
final boolean areAllItemsSelectable = mAreAllItemsSelectable;
final ListAdapter adapter = mAdapter;
if (!mStackFromBottom) {
int bottom;
@@ -2779,7 +2781,10 @@ public class ListView extends AbsListView {
(footerDividers || first + i < footerLimit)) {
View child = getChildAt(i);
bottom = child.getBottom();
if (bottom < listBottom) {
// Don't draw dividers next to items that are not enabled
if (bottom < listBottom && (areAllItemsSelectable ||
(adapter.isEnabled(first + i) && (i == count - 1 ||
adapter.isEnabled(first + i + 1))))) {
bounds.top = bottom;
bounds.bottom = bottom + dividerHeight;
drawDivider(canvas, bounds, i);
@@ -2795,7 +2800,10 @@ public class ListView extends AbsListView {
(footerDividers || first + i < footerLimit)) {
View child = getChildAt(i);
top = child.getTop();
if (top > listTop) {
// Don't draw dividers next to items that are not enabled
if (top > listTop && (areAllItemsSelectable ||
(adapter.isEnabled(first + i) && (i == count - 1 ||
adapter.isEnabled(first + i + 1))))) {
bounds.top = top - dividerHeight;
bounds.bottom = top;
// Give the method the child ABOVE the divider, so we