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

* commit '9bf9a3a99ec29beff823607b5327347434d0f3fe':
  Constrain FastScroller max width to be >= 0
This commit is contained in:
Alan Viverette
2015-06-24 18:33:06 +00:00
committed by Android Git Automerger

View File

@@ -660,7 +660,7 @@ class FastScroller {
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 heightMeasureSpec = MeasureSpec.makeSafeMeasureSpec(container.height(),
MeasureSpec.UNSPECIFIED);