summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2011-02-22 10:55:44 -0800
committerAndroid Code Review <code-review@android.com>2011-02-22 10:55:44 -0800
commita67191a17428cb4fecac887b836401358d1ef792 (patch)
tree8ad449b096023b128abafca86a62fd096e71b301 /core/java
parent4564e9c34fb1c95d96f0a9d43bfa77ed41dc637c (diff)
parent0b1ab3a2776a1fff5b2abbddd3bc256e355e30ef (diff)
downloadframeworks_base-a67191a17428cb4fecac887b836401358d1ef792.zip
frameworks_base-a67191a17428cb4fecac887b836401358d1ef792.tar.gz
frameworks_base-a67191a17428cb4fecac887b836401358d1ef792.tar.bz2
Merge "Fix for an infinite loop while scrolling lists."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/EdgeGlow.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/widget/EdgeGlow.java b/core/java/android/widget/EdgeGlow.java
index 416be86..a11de6f 100644
--- a/core/java/android/widget/EdgeGlow.java
+++ b/core/java/android/widget/EdgeGlow.java
@@ -317,6 +317,7 @@ public class EdgeGlow {
mEdgeScaleY = mEdgeScaleYStart +
(mEdgeScaleYFinish - mEdgeScaleYStart) *
interp * factor;
+ mState = STATE_RECEDE;
break;
case STATE_RECEDE:
mState = STATE_IDLE;