diff options
| author | Adam Powell <adamp@google.com> | 2011-01-27 16:02:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-27 16:02:33 -0800 |
| commit | 4d7b10630a5192bfe84181a83c70c38ef0655b5f (patch) | |
| tree | b8ab05d98b05a323111e36a1b610096becf593eb /core/java | |
| parent | d1654ab25cda31e510eaf975f4a9951437447e10 (diff) | |
| parent | e3ba5cfe9b4f524d955f77f5fff53440d80f9464 (diff) | |
| download | frameworks_base-4d7b10630a5192bfe84181a83c70c38ef0655b5f.zip frameworks_base-4d7b10630a5192bfe84181a83c70c38ef0655b5f.tar.gz frameworks_base-4d7b10630a5192bfe84181a83c70c38ef0655b5f.tar.bz2 | |
am e3ba5cfe: am d1f94e36: Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb
* commit 'e3ba5cfe9b4f524d955f77f5fff53440d80f9464':
Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag
Diffstat (limited to 'core/java')
| -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 6d2292f..7536be1 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -7580,10 +7580,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; @@ -7592,6 +7588,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); @@ -7608,6 +7609,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); |