1 files changed, 18 insertions, 3 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoriteTileView.java b/src/com/android/dialer/list/PhoneFavoriteTileView.java
index dc82f73a4..8887a2c47 100644
--- a/src/com/android/dialer/list/PhoneFavoriteTileView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteTileView.java
@@ -144,6 +144,18 @@ public abstract class PhoneFavoriteTileView extends ContactTileView {
             animSet.playTogether(fadeIn);
         }
 
+        animSet.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                mParentRow.setHasTransientState(true);
+            };
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mParentRow.setHasTransientState(false);
+            }
+        });
+
         animSet.start();
     }
 
@@ -164,19 +176,22 @@ public abstract class PhoneFavoriteTileView extends ContactTileView {
                 "alpha", 255).setDuration(ANIMATION_LENGTH);
         final AnimatorSet animSet = new AnimatorSet();
         animSet.playTogether(fadeIn, moveBack, backgroundFadeOut);
-        animSet.start();
         animSet.addListener(new AnimatorListenerAdapter() {
             @Override
+            public void onAnimationStart(Animator animation) {
+                mParentRow.setHasTransientState(true);
+            }
+            @Override
             public void onAnimationEnd(Animator animation) {
                 if (mParentRow.getItemViewType() == ViewTypes.FREQUENT) {
                     SwipeHelper.setSwipeable(mParentRow, true);
                 } else {
                     SwipeHelper.setSwipeable(PhoneFavoriteTileView.this, true);
                 }
+                mParentRow.setHasTransientState(false);
             }
         });
-
-
+        animSet.start();
         // Signals the PhoneFavoritesTileAdapter to undo the potential delete.
         mParentRow.getTileAdapter().undoPotentialRemoveEntryIndex();
     }