From 934d3ee3052cfdd994e31ab2bcf00747fd9776d8 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Mon, 21 Oct 2013 18:07:10 -0700 Subject: Fix call log jank Restore previous jank-fix while ensuring that contacts with images not in the ContactProvider are still updated Bug: 11289654 Change-Id: I89723bd08c9dc83731b7a7555dc0364c74faa9a4 --- src/com/android/dialer/calllog/CallLogAdapter.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 9392410d1..e4fd0d897 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -388,7 +388,16 @@ public class CallLogAdapter extends GroupingListAdapter NumberWithCountryIso numberCountryIso = new NumberWithCountryIso(number, countryIso); ContactInfo existingInfo = mContactInfoCache.getPossiblyExpired(numberCountryIso); - boolean updated = !info.equals(existingInfo); + final boolean isRemoteSource = info.sourceType != 0; + + // Don't force redraw if existing info in the cache is equal to {@link ContactInfo#EMPTY} + // to avoid updating the data set for every new row that is scrolled into view. + // see (https://googleplex-android-review.git.corp.google.com/#/c/166680/) + + // Exception: Photo uris for contacts from remote sources are not cached in the call log + // cache, so we have to force a redraw for these contacts regardless. + boolean updated = (existingInfo != ContactInfo.EMPTY || isRemoteSource) && + !info.equals(existingInfo); // Store the data in the cache so that the UI thread can use to display it. Store it // even if it has not changed so that it is marked as not expired. -- cgit v1.2.3