commit 6ede26cd243de0b475a181e16cfe7d505fb3be4d
author Hongwei Wang <hwwang@google.com> Thu Sep 19 15:16:00 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 19 15:16:00 2013 -0700
tree b78a6337d2bc986c82ecf94f008aa48320fab9a0
parent a0bf8d4678f60faa1ca5de366d7a5e8a7df9a953
parent 20d682f9a586da495f180bfb6a445520d027c74d

am 20d682f9: Tweak the animation for Drag and Drop. Finale

* commit '20d682f9a586da495f180bfb6a445520d027c74d':
  Tweak the animation for Drag and Drop. Finale

src/com/android/dialer/list/PhoneFavoriteFragment.java

diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 9e84760..d731786 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -143,7 +143,6 @@
         @Override
         public void onScrollStateChanged(AbsListView view, int scrollState) {
             mActivityScrollListener.onListFragmentScrollStateChange(scrollState);
-            mLastScrollState = scrollState;
         }
     }
 
@@ -186,8 +185,6 @@
             new ContactTileLoaderListener();
     private final ScrollListener mScrollListener = new ScrollListener();
 
-    private int mLastScrollState = ListView.OnScrollListener.SCROLL_STATE_IDLE;
-
     @Override
     public void onAttach(Activity activity) {
         if (DEBUG) Log.d(TAG, "onAttach()");
@@ -453,8 +450,7 @@
      * animations will be performed instead.
      */
     private void animateListView(final long... idsInPlace) {
-        if (mItemIdTopMap.isEmpty() ||
-                mLastScrollState == ListView.OnScrollListener.SCROLL_STATE_FLING) {
+        if (mItemIdTopMap.isEmpty()) {
             // Don't do animations if the database is being queried for the first time and
             // the previous item offsets have not been cached, or the user hasn't done anything
             // (dragging, swiping etc) that requires an animation.
@@ -501,10 +497,10 @@
                             startTop = top + (i > 0 ? childHeight : -childHeight);
                             delta = startTop - top;
                         } else {
-                            // In the case the first non-square row is pushed down
+                            // In case the first non-square row is pushed down
                             // from the square section.
                             animators.add(ObjectAnimator.ofFloat(
-                                    child, "translationX", -child.getWidth(), 0.0f));
+                                    child, "alpha", 0.0f, 1.0f));
                         }
                         if (DEBUG) {
                             Log.d(TAG, "Found itemId: " + itemId + " for listview child " + i +