summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-12-13 18:06:00 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-13 18:06:00 -0800
commit09f421481b73d7b27afc27eae1de5468fe4b4347 (patch)
tree75418bb0b66dc1322e2cc288ff64a41e355bfbd0 /core
parentdee4cb07a3652457e18a0bf4be57d2cedeca7359 (diff)
parent3cd0c571ead0795d6e3d86a2865d51ff35b01c6f (diff)
downloadframeworks_base-09f421481b73d7b27afc27eae1de5468fe4b4347.zip
frameworks_base-09f421481b73d7b27afc27eae1de5468fe4b4347.tar.gz
frameworks_base-09f421481b73d7b27afc27eae1de5468fe4b4347.tar.bz2
Merge "Fix bug 3281956 - Cherry-picked from GB"
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/AbsListView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 87e4b5a..0b4e6c3 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -3573,7 +3573,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
overScrollBy(0, overshoot, 0, mScrollY, 0, 0,
0, mOverflingDistance, false);
}
- edgeReached(delta);
+ if (more) {
+ edgeReached(delta);
+ }
break;
}