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

am: de613b2

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

Change-Id: I1abfe8823e029d3c52c629a32b351f6b9985d134

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;