From d19e86f0a9686f4df6cfbe1227921f2b529d9038 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Fri, 25 Sep 2015 11:57:30 -0700
Subject: [PATCH] Merge d8ea1b194b446f555402770acd8ac6b217becb7c to fn3

---
 packages/flutter/lib/src/fn3/scrollable.dart | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/flutter/lib/src/fn3/scrollable.dart b/packages/flutter/lib/src/fn3/scrollable.dart
index 2bf05d299a..b5429c8c42 100644
--- a/packages/flutter/lib/src/fn3/scrollable.dart
+++ b/packages/flutter/lib/src/fn3/scrollable.dart
@@ -158,6 +158,14 @@ abstract class ScrollableState<T extends Scrollable> extends State<T> {
     return scrollTo(newScrollOffset, duration: duration, curve: curve);
   }
 
+  void fling(Offset velocity) {
+    if (velocity != Offset.zero) {
+      _startToEndAnimation(velocity: _scrollVelocity(velocity));
+    } else if (!_toEndAnimation.isAnimating && (_toOffsetAnimation == null || !_toOffsetAnimation.isAnimating)) {
+      settleScrollOffset();
+    }
+  }
+
   void settleScrollOffset() {
     _startToEndAnimation();
   }
@@ -180,11 +188,7 @@ abstract class ScrollableState<T extends Scrollable> extends State<T> {
   }
 
   void _handleDragEnd(Offset velocity) {
-    if (velocity != Offset.zero) {
-      _startToEndAnimation(velocity: _scrollVelocity(velocity));
-    } else if (!_toEndAnimation.isAnimating && (_toOffsetAnimation == null || !_toOffsetAnimation.isAnimating)) {
-      settleScrollOffset();
-    }
+    fling(velocity);
   }
 
   final List<ScrollListener> _listeners = new List<ScrollListener>();
@@ -520,7 +524,7 @@ class PageableListState<T> extends ScrollableListState<T, PageableList<T>> {
       .clamp(scrollBehavior.minScrollOffset, scrollBehavior.maxScrollOffset);
   }
 
-  void _handleDragEnd(sky.Offset velocity) {
+  void fling(sky.Offset velocity) {
     double scrollVelocity = _scrollVelocity(velocity);
     double newScrollOffset = _snapScrollOffset(scrollOffset + scrollVelocity.sign * config.itemExtent)
       .clamp(_snapScrollOffset(scrollOffset - config.itemExtent / 2.0),