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

Commit 92061b70 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryrom 

* commit '79aa4030':
  Can't stop the fling! Bug: 5335420
parents 6185a5ca 79aa4030

core/java/android/widget/AbsListView.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -3654,7 +3654,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                vt.computeCurrentVelocity(1000, mMaximumVelocity);

                vt.computeCurrentVelocity(1000, mMaximumVelocity);

                final float yvel = -vt.getYVelocity(activeId);

                final float yvel = -vt.getYVelocity(activeId);





                if (scroller.isScrollingInDirection(0, yvel)) {

                if (Math.abs(yvel) >= mMinimumVelocity

                        && scroller.isScrollingInDirection(0, yvel)) {

                    // Keep the fling alive a little longer

                    // Keep the fling alive a little longer

                    postDelayed(this, FLYWHEEL_TIMEOUT);

                    postDelayed(this, FLYWHEEL_TIMEOUT);

                } else {

                } else {

libs/ui/Input.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -1020,6 +1020,8 @@ bool VelocityTracker::getVelocity(uint32_t id, float* outVx, float* outVy) const 
            return true;

            return true;

        }

        }

    }

    }

    *outVx = 0;

    *outVy = 0;

    return false;

    return false;

}

}

core/java/android/widget/OverScroller.java

+1 −1

File changed.

Contains only whitespace changes.