diff options
| author | Adam Powell <adamp@google.com> | 2011-01-27 15:58:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-27 15:58:18 -0800 |
| commit | d1f94e36da6276acc00d0a3267a505fd6a61702d (patch) | |
| tree | 43c9436ba4703701fd2a0372bb97543f2c68499e /core/java/android | |
| parent | a3e586af439137eb4216bc7ba62167f516e028c2 (diff) | |
| parent | 3ba6774263db28bdfaa88bfdc4f2dfb37d6ce26a (diff) | |
| download | frameworks_base-d1f94e36da6276acc00d0a3267a505fd6a61702d.zip frameworks_base-d1f94e36da6276acc00d0a3267a505fd6a61702d.tar.gz frameworks_base-d1f94e36da6276acc00d0a3267a505fd6a61702d.tar.bz2 | |
Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/View.java | 14 |
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); |