Merge "Import translations. DO NOT MERGE" into klp-dev
diff --git a/src/com/android/dialer/list/SwipeableListView.java b/src/com/android/dialer/list/SwipeableListView.java
index 29c4f67..8f50f4c 100644
--- a/src/com/android/dialer/list/SwipeableListView.java
+++ b/src/com/android/dialer/list/SwipeableListView.java
@@ -151,10 +151,14 @@
     }
 
     @Override
-    public void onDragCancelled(View v) {}
+    public void onDragCancelled(View v) {
+        v.setHasTransientState(false);
+    }
 
     @Override
     public void onBeginDrag(View v) {
+        final View tileRow = (View) v.getParent();
+        tileRow.setHasTransientState(true);
         // We do this so the underlying ScrollView knows that it won't get
         // the chance to intercept events anymore
         requestDisallowInterceptTouchEvent(true);