commit 3ba6774263db28bdfaa88bfdc4f2dfb37d6ce26a
author Adam Powell <adamp@google.com> Thu Jan 27 14:16:55 2011 -0800
committer Adam Powell <adamp@google.com> Thu Jan 27 14:25:44 2011 -0800
tree bee03f5b762ac87a0ab135c40b1e7991e544c0e0
parent 315f3865983f59e5ad9f42602f443e8c42b6e5c4

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

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 @@
                 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 @@
                 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 @@
                 }
 
                 if (drawVerticalScrollBar) {
+                    int size = scrollBar.getSize(true);
+                    if (size <= 0) {
+                        size = cache.scrollBarSize;
+                    }
+
                     scrollBar.setParameters(computeVerticalScrollRange(),
                                             computeVerticalScrollOffset(),
                                             computeVerticalScrollExtent(), true);