Always account for divider height when calculating list height

List items are always positioned using the divider height, even if there
is no divider drawable, so we should account for that when calculating
list height.

Bug: 28402970
Change-Id: I14b8d3b04a369749ff4b7e6f1e6e003ac08f6b7f

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java
index bfc87f297d42..bb1ffcb2d5c6 100644
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -1308,7 +1308,7 @@ public class ListView extends AbsListView {
 
         // Include the padding of the list
         int returnedHeight = mListPadding.top + mListPadding.bottom;
-        final int dividerHeight = ((mDividerHeight > 0) && mDivider != null) ? mDividerHeight : 0;
+        final int dividerHeight = mDividerHeight;
         // The previous height value that was less than maxHeight and contained
         // no partial children
         int prevHeightWithoutPartialChild = 0;