Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3ba5cfe authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am d1f94e36: Merge "Fix bug 3399725 - externally reported issue 14317:... 

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

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

core/java/android/view/View.java

+10 −4
Original line number Diff line number Diff line
@@ -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);