am d1f94e36: Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb

* commit 'd1f94e36da6276acc00d0a3267a505fd6a61702d':
  Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag

1 files changed, 10 insertions, 4 deletions

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);