Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7bdde2b authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

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

am: fab88eab

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

Change-Id: Iaa4b1588f6237a294d0ed446e5db97874b000a76
parents c799e9bf fab88eab

core/java/android/widget/ListView.java

+1 −1
Original line number Diff line number Diff line
@@ -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;