Merge "Fix case when user touches the very edge of a view" into klp-dev

2013-08-28 23:08:53 +00:00
parent 627dd9b584 0d3da1232b
commit dd9b079cdf
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/widget/AutoScrollHelper.java
+++ b/core/java/com/android/internal/widget/AutoScrollHelper.java
@@ -531,7 +531,7 @@ public abstract class AutoScrollHelper implements View.OnTouchListener {
            case EDGE_TYPE_INSIDE:
            case EDGE_TYPE_INSIDE_EXTEND:
                if (current < leading) {
-                    if (current > 0) {
+                    if (current >= 0) {
                        // Movement up to the edge is scaled.
                        return 1f - current / leading;
                    } else if (mActive && (mEdgeType == EDGE_TYPE_INSIDE_EXTEND)) {