commit 6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1
author Mindy Pereira <mindyp@google.com> Tue Oct 19 17:36:01 2010 -0700
committer Mindy Pereira <mindyp@google.com> Tue Oct 19 17:38:24 2010 -0700
tree f73ca32a79f088ce9ab802a2dd12634c825ec596
parent 218bf88446d01fb2f8d79eec3be59bee995f9cb0

DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.

Fixes b/3111778 overscroll glitch in news & weather

Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac

core/java/android/widget/HorizontalScrollView.java

diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java
index d38eef3..fee3455 100644
--- a/core/java/android/widget/HorizontalScrollView.java
+++ b/core/java/android/widget/HorizontalScrollView.java
@@ -551,6 +551,10 @@
                                 mEdgeGlowLeft.onRelease();
                             }
                         }
+                        if (mEdgeGlowLeft != null
+                                && (!mEdgeGlowLeft.isFinished() || !mEdgeGlowRight.isFinished())) {
+                            invalidate();
+                        }
                     }
                 }
                 break;

core/java/android/widget/ScrollView.java

diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java
index 1daf2ab..2ad67ba 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -546,6 +546,10 @@
                                 mEdgeGlowTop.onRelease();
                             }
                         }
+                        if (mEdgeGlowTop != null
+                                && (!mEdgeGlowTop.isFinished() || !mEdgeGlowBottom.isFinished())) {
+                            invalidate();
+                        }
                     }
                 }
                 break;