Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alan Viverette
2016-04-27 21:50:46 +00:00
committed by Android (Google) Code Review
parent d803d73331 fea4013499
commit fab88eab31
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/ListView.java
View File

@@ -1308,7 +1308,7 @@ public class ListView extends AbsListView {
// Include the padding of the list // Include the padding of the list
int returnedHeight = mListPadding.top + mListPadding.bottom; 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 // The previous height value that was less than maxHeight and contained
// no partial children // no partial children
int prevHeightWithoutPartialChild = 0; int prevHeightWithoutPartialChild = 0;