From 3ba6774263db28bdfaa88bfdc4f2dfb37d6ce26a Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Thu, 27 Jan 2011 14:16:55 -0800 Subject: Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag Change-Id: Ic2cc908936991f473ccfc60d9c2711edfd45c132 --- core/java/android/view/View.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'core/java/android') diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 5e8f31a..d0b150b 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -7539,10 +7539,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility final int height = mBottom - mTop; final ScrollBarDrawable scrollBar = cache.scrollBar; - int size = scrollBar.getSize(false); - if (size <= 0) { - size = cache.scrollBarSize; - } final int scrollX = mScrollX; final int scrollY = mScrollY; @@ -7551,6 +7547,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility int left, top, right, bottom; if (drawHorizontalScrollBar) { + int size = scrollBar.getSize(false); + if (size <= 0) { + size = cache.scrollBarSize; + } + scrollBar.setParameters(computeHorizontalScrollRange(), computeHorizontalScrollOffset(), computeHorizontalScrollExtent(), false); @@ -7567,6 +7568,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility } if (drawVerticalScrollBar) { + int size = scrollBar.getSize(true); + if (size <= 0) { + size = cache.scrollBarSize; + } + scrollBar.setParameters(computeVerticalScrollRange(), computeVerticalScrollOffset(), computeVerticalScrollExtent(), true); -- cgit v1.1