summaryrefslogtreecommitdiff
path: root/core/java/android/widget/FastScroller.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-06-24 10:22:02 -0700
committerAlan Viverette <alanv@google.com>2015-06-24 10:22:02 -0700
commitc98922ba2fa3b35e1395bd68d8525d51af4ac11f (patch)
treefafc40e89cb982f7f1590f928c1ecd0afdb50b13 /core/java/android/widget/FastScroller.java
parentc60408264c7fe19d2f1f3550556f7e6bc1ca716d (diff)
Constrain FastScroller max width to be >= 0
Bug: 22055552 Change-Id: Ib0bba93e5490ad9d8668c9532f23654a8cb702d9
Diffstat (limited to 'core/java/android/widget/FastScroller.java')
-rw-r--r--core/java/android/widget/FastScroller.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java
index 11d70265342d..3ee273cc9ad6 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);