From c98922ba2fa3b35e1395bd68d8525d51af4ac11f Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Wed, 24 Jun 2015 10:22:02 -0700 Subject: [PATCH] Constrain FastScroller max width to be >= 0 Bug: 22055552 Change-Id: Ib0bba93e5490ad9d8668c9532f23654a8cb702d9 --- core/java/android/widget/FastScroller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java index 11d70265342df..3ee273cc9ad69 100644 --- a/core/java/android/widget/FastScroller.java +++ b/core/java/android/widget/FastScroller.java @@ -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);