Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd1f94e36da6276acc00d0a3267a505fd6a61702d':
  Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag
This commit is contained in:
Adam Powell
2011-01-27 15:59:46 -08:00
committed by Android Git Automerger
parent 4c02c2246a d1f94e36da
commit e3ba5cfe9b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/view/View.java
View File

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