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

Commit 40cd1cf6 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo

parents ae18171a a0d645cb

core/java/android/widget/AbsListView.java

+2 −9
Original line number Diff line number Diff line
@@ -2483,16 +2483,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                    delta = Math.max(-(getHeight() - mPaddingBottom - mPaddingTop - 1), delta);

                }



                // Check to see if we have bumped into the scroll limit

                View motionView = getChildAt(mMotionPosition - mFirstPosition);

                int oldTop = 0;

                if (motionView != null) {

                    oldTop = motionView.getTop();

                }



                trackMotionScroll(delta, delta);

                final boolean atEnd = trackMotionScroll(delta, delta);



                if (more) {

                if (more && !atEnd) {

                    invalidate();

                    mLastFlingY = y;

                    post(this);

core/java/android/widget/HorizontalScrollView.java

+1 −0
Original line number Diff line number Diff line
@@ -1022,6 +1022,7 @@ public class HorizontalScrollView extends FrameLayout { 
                    onScrollChanged(x, y, oldX, oldY);

                }

            }

            awakenScrollBars();



            // Keep on drawing until the animation has finished.

            postInvalidate();

core/java/android/widget/ScrollView.java

+1 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,7 @@ public class ScrollView extends FrameLayout { 
                    onScrollChanged(x, y, oldX, oldY);

                }

            }

            awakenScrollBars();



            // Keep on drawing until the animation has finished.

            postInvalidate();