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

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

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

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

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

core/java/android/view/View.java

+10 −4
Original line number Original line Diff line number Diff line
@@ -7580,10 +7580,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
                final int height = mBottom - mTop;

                final int height = mBottom - mTop;





                final ScrollBarDrawable scrollBar = cache.scrollBar;

                final ScrollBarDrawable scrollBar = cache.scrollBar;

                int size = scrollBar.getSize(false);

                if (size <= 0) {

                    size = cache.scrollBarSize;

                }





                final int scrollX = mScrollX;

                final int scrollX = mScrollX;

                final int scrollY = mScrollY;

                final int scrollY = mScrollY;
@@ -7592,6 +7588,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
                int left, top, right, bottom;

                int left, top, right, bottom;

                

                

                if (drawHorizontalScrollBar) {

                if (drawHorizontalScrollBar) {

                    int size = scrollBar.getSize(false);

                    if (size <= 0) {

                        size = cache.scrollBarSize;

                    }



                    scrollBar.setParameters(computeHorizontalScrollRange(),

                    scrollBar.setParameters(computeHorizontalScrollRange(),

                                            computeHorizontalScrollOffset(),

                                            computeHorizontalScrollOffset(),

                                            computeHorizontalScrollExtent(), false);

                                            computeHorizontalScrollExtent(), false);
@@ -7608,6 +7609,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
                }

                }





                if (drawVerticalScrollBar) {

                if (drawVerticalScrollBar) {

                    int size = scrollBar.getSize(true);

                    if (size <= 0) {

                        size = cache.scrollBarSize;

                    }



                    scrollBar.setParameters(computeVerticalScrollRange(),

                    scrollBar.setParameters(computeVerticalScrollRange(),

                                            computeVerticalScrollOffset(),

                                            computeVerticalScrollOffset(),

                                            computeVerticalScrollExtent(), true);

                                            computeVerticalScrollExtent(), true);