Preventing background flicker in contact list

Change-Id: Idfc3e0599a0401d5d222bb9f2b42ae58e4f62147
diff --git a/src/com/android/contacts/ContactNameHighlightingAnimation.java b/src/com/android/contacts/ContactNameHighlightingAnimation.java
index 68664b3..801a522 100644
--- a/src/com/android/contacts/ContactNameHighlightingAnimation.java
+++ b/src/com/android/contacts/ContactNameHighlightingAnimation.java
@@ -27,6 +27,7 @@
  */
 public class ContactNameHighlightingAnimation extends TextHighlightingAnimation {
     private final ListView mListView;
+    private boolean mSavedScrollingCacheEnabledFlag;
 
     public ContactNameHighlightingAnimation(ListView listView, int duration) {
         super(duration);
@@ -50,11 +51,12 @@
 
     @Override
     protected void onAnimationStarted() {
+        mSavedScrollingCacheEnabledFlag = mListView.isScrollingCacheEnabled();
         mListView.setScrollingCacheEnabled(false);
     }
 
     @Override
     protected void onAnimationEnded() {
-        mListView.setScrollingCacheEnabled(true);
+        mListView.setScrollingCacheEnabled(mSavedScrollingCacheEnabledFlag);
     }
 }