commit c98922ba2fa3b35e1395bd68d8525d51af4ac11f
author Alan Viverette <alanv@google.com> Wed Jun 24 10:22:02 2015 -0700
committer Alan Viverette <alanv@google.com> Wed Jun 24 10:22:02 2015 -0700
tree fafc40e89cb982f7f1590f928c1ecd0afdb50b13
parent c60408264c7fe19d2f1f3550556f7e6bc1ca716d

Constrain FastScroller max width to be >= 0

Bug: 22055552
Change-Id: Ib0bba93e5490ad9d8668c9532f23654a8cb702d9

core/java/android/widget/FastScroller.java

diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java
index 11d7026..3ee273c 100644
--- a/core/java/android/widget/FastScroller.java
+++ b/core/java/android/widget/FastScroller.java
@@ -660,7 +660,7 @@
             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);