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

am 44863749: am 9bf9a3a9: Merge "Constrain FastScroller max width to be >= 0" into mnc-dev

Browse Source 
* commit '448637498e66a8b5d2914ed0a99238c0a95c1133':
  Constrain FastScroller max width to be >= 0
This commit is contained in:
Alan Viverette
2015-06-24 18:49:35 +00:00
committed by Android Git Automerger
parent d8657972d7 448637498e
commit ff9b80d3be
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/FastScroller.java
View File

@@ -660,7 +660,7 @@ class FastScroller {
maxWidth = containerWidth - adjacent.getRight(); maxWidth = containerWidth - adjacent.getRight();
} }
final int adjMaxWidth = maxWidth - marginLeft - marginRight; final int adjMaxWidth = Math.max(0, maxWidth - marginLeft - marginRight);
final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(adjMaxWidth, MeasureSpec.AT_MOST); final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(adjMaxWidth, MeasureSpec.AT_MOST);
final int heightMeasureSpec = MeasureSpec.makeSafeMeasureSpec(container.height(), final int heightMeasureSpec = MeasureSpec.makeSafeMeasureSpec(container.height(),
MeasureSpec.UNSPECIFIED); MeasureSpec.UNSPECIFIED);