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

am: 958f6002

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

Change-Id: I09655c7d4a330e9340035f334d0a65d55840f5a1

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;