commit 469c6cc2226a9454bda86cd5aa95e771ab09fdb8
author Dmitri Plotnikov <dplotnikov@google.com> Wed Jun 16 16:59:31 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Jun 16 16:59:31 2010 -0700
tree 2e82933010ccd54430975ed965c833c6e55365ea
parent f52d9878819d55933ed8152ffc8ae8fcdc54210d

Disabling name animation in the Strequent view

Change-Id: I83438184f0b953bf1fd11421f1356c064350dae2

src/com/android/contacts/list/ContactEntryListAdapter.java

diff --git a/src/com/android/contacts/list/ContactEntryListAdapter.java b/src/com/android/contacts/list/ContactEntryListAdapter.java
index 16f63e2..f7f4fdb 100644
--- a/src/com/android/contacts/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java
@@ -152,7 +152,6 @@
         mSortOrder = sortOrder;
     }
 
-    // TODO no highlighting in STREQUENT mode
     public void setNameHighlightingEnabled(boolean flag) {
         mNameHighlightingEnabled = flag;
     }

src/com/android/contacts/list/ContactEntryListFragment.java

diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index ad6280e..44c50af 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -644,17 +644,18 @@
     }
 
     protected void configureAdapter() {
-        if (mAdapter != null) {
-            mAdapter.setQueryString(mQueryString);
-            mAdapter.setPinnedPartitionHeadersEnabled(mSearchMode);
-            mAdapter.setContactNameDisplayOrder(mDisplayOrder);
-            mAdapter.setSortOrder(mSortOrder);
-            mAdapter.setNameHighlightingEnabled(isNameHighlighingEnabled());
-            mAdapter.setSectionHeaderDisplayEnabled(mSectionHeaderDisplayEnabled);
+        if (mAdapter == null) {
+            return;
         }
+        mAdapter.setQueryString(mQueryString);
+        mAdapter.setPinnedPartitionHeadersEnabled(mSearchMode);
+        mAdapter.setContactNameDisplayOrder(mDisplayOrder);
+        mAdapter.setSortOrder(mSortOrder);
+        mAdapter.setNameHighlightingEnabled(isNameHighlighingEnabled());
+        mAdapter.setSectionHeaderDisplayEnabled(mSectionHeaderDisplayEnabled);
     }
 
-    private boolean isNameHighlighingEnabled() {
+    protected boolean isNameHighlighingEnabled() {
         // When sort order and display order contradict each other, we want to
         // highlight the part of the name used for sorting.
         if (mSortOrder == ContactsContract.Preferences.SORT_ORDER_PRIMARY &&

src/com/android/contacts/list/StrequentContactListFragment.java

diff --git a/src/com/android/contacts/list/StrequentContactListFragment.java b/src/com/android/contacts/list/StrequentContactListFragment.java
index 264f2c0..4b8e2bb 100644
--- a/src/com/android/contacts/list/StrequentContactListFragment.java
+++ b/src/com/android/contacts/list/StrequentContactListFragment.java
@@ -38,6 +38,13 @@
         setPhotoLoaderEnabled(true);
     }
 
+    @Override
+    protected boolean isNameHighlighingEnabled() {
+        // Since the list is not ordered alphabetically, we don't need to highlight the part
+        // that is used for sorting.
+        return false;
+    }
+
     public void setStarredContactsIncluded(boolean flag) {
         mStarredContactsIncluded = flag;
         configureAdapter();

src/com/android/contacts/widget/TextHighlightingAnimation.java

diff --git a/src/com/android/contacts/widget/TextHighlightingAnimation.java b/src/com/android/contacts/widget/TextHighlightingAnimation.java
index 049e5cd..21bbc63 100644
--- a/src/com/android/contacts/widget/TextHighlightingAnimation.java
+++ b/src/com/android/contacts/widget/TextHighlightingAnimation.java
@@ -20,7 +20,6 @@
 import android.database.CharArrayBuffer;
 import android.graphics.Color;
 import android.os.Handler;
-import android.text.Spanned;
 import android.text.TextPaint;
 import android.text.style.CharacterStyle;
 import android.view.animation.AccelerateInterpolator;