Merge "Always account for divider height when calculating list height" into nyc-dev

am: fab88ea

* commit 'fab88eab310c892654506b3ad6e0eae4c0a8649e':
  Always account for divider height when calculating list height

Change-Id: Iaa4b1588f6237a294d0ed446e5db97874b000a76

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;