Merge "Do not smoothScrollBy(0)"
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index 0315cc5..53179f5 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -336,12 +336,14 @@
* If needed, snap the subviews to the top of the Window.
*/
private boolean snapToTop(int flingDelta) {
+ final int requiredScroll = -getScroll_ignoreOversizedHeader() + mTransparentStartHeight;
if (-getScroll_ignoreOversizedHeader() - flingDelta < 0
- && -getScroll_ignoreOversizedHeader() - flingDelta > -mTransparentStartHeight) {
+ && -getScroll_ignoreOversizedHeader() - flingDelta > -mTransparentStartHeight
+ && requiredScroll != 0) {
// We finish scrolling above the empty starting height, and aren't projected
// to fling past the top of the Window, so elastically snap the empty space shut.
mScroller.forceFinished(true);
- smoothScrollBy(-getScroll_ignoreOversizedHeader() + mTransparentStartHeight);
+ smoothScrollBy(requiredScroll);
return true;
}
return false;