diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-09 01:46:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-09 01:46:28 +0000 |
commit | 20ebcdca46e6be68050cd44087f0f768f5dae5c6 (patch) | |
tree | 5bc845fb459a8958ec9c5a055d12a84c92b23443 /java/com/android/dialer/app/calllog/CallLogAdapter.java | |
parent | d806c2321eba63fa6d8f28471ab48847b8b6e92c (diff) | |
parent | 77c2b4c1711cee43b69d54bf180e14ccda70e92f (diff) |
Merge changes I220cb741,I471b2d19
* changes:
Add "Set up" and "Invite" for video to call log entry actions
Fix voicemail populator bug and change emergency call to emergency call back.
Diffstat (limited to 'java/com/android/dialer/app/calllog/CallLogAdapter.java')
-rw-r--r-- | java/com/android/dialer/app/calllog/CallLogAdapter.java | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 4f78bc97f..f4565550a 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -828,65 +828,65 @@ public class CallLogAdapter extends GroupingListAdapter } private void loadAndRender( - final CallLogListItemViewHolder views, + final CallLogListItemViewHolder viewHolder, final long rowId, final PhoneCallDetails details, final CallDetailsEntries callDetailsEntries) { - LogUtil.d("CallLogAdapter.loadAndRender", "position: %d", views.getAdapterPosition()); + LogUtil.d("CallLogAdapter.loadAndRender", "position: %d", viewHolder.getAdapterPosition()); // Reset block and spam information since this view could be reused which may contain // outdated data. - views.isSpam = false; - views.blockId = null; - views.isSpamFeatureEnabled = false; + viewHolder.isSpam = false; + viewHolder.blockId = null; + viewHolder.isSpamFeatureEnabled = false; // Attempt to set the isCallComposerCapable field. If capabilities are unknown for this number, // the value will be false while capabilities are requested. mExpandCollapseListener will // attempt to set the field properly in that case - views.isCallComposerCapable = isCallComposerCapable(views.number); - views.setDetailedPhoneDetails(callDetailsEntries); - views.duoReady = getDuo().isReachable(mActivity, views.number); + viewHolder.isCallComposerCapable = isCallComposerCapable(viewHolder.number); + viewHolder.setDetailedPhoneDetails(callDetailsEntries); + viewHolder.duo = getDuo(); final AsyncTask<Void, Void, Boolean> loadDataTask = new AsyncTask<Void, Void, Boolean>() { @Override protected Boolean doInBackground(Void... params) { - views.blockId = + viewHolder.blockId = mFilteredNumberAsyncQueryHandler.getBlockedIdSynchronous( - views.number, views.countryIso); - details.isBlocked = views.blockId != null; + viewHolder.number, viewHolder.countryIso); + details.isBlocked = viewHolder.blockId != null; if (isCancelled()) { return false; } if (mIsSpamEnabled) { - views.isSpamFeatureEnabled = true; + viewHolder.isSpamFeatureEnabled = true; // Only display the call as a spam call if there are incoming calls in the list. // Call log cards with only outgoing calls should never be displayed as spam. - views.isSpam = + viewHolder.isSpam = details.hasIncomingCalls() && Spam.get(mActivity) - .checkSpamStatusSynchronous(views.number, views.countryIso); - details.isSpam = views.isSpam; + .checkSpamStatusSynchronous(viewHolder.number, viewHolder.countryIso); + details.isSpam = viewHolder.isSpam; } - return !isCancelled() && loadData(views, rowId, details); + return !isCancelled() && loadData(viewHolder, rowId, details); } @Override protected void onPostExecute(Boolean success) { - views.isLoaded = true; + viewHolder.isLoaded = true; if (success) { - views.callbackAction = getCallbackAction(views.rowId); - int currentDayGroup = getDayGroup(views.rowId); + viewHolder.callbackAction = getCallbackAction(viewHolder.rowId); + int currentDayGroup = getDayGroup(viewHolder.rowId); if (currentDayGroup != details.previousGroup) { - views.dayGroupHeaderVisibility = View.VISIBLE; - views.dayGroupHeaderText = getGroupDescription(currentDayGroup); + viewHolder.dayGroupHeaderVisibility = View.VISIBLE; + viewHolder.dayGroupHeaderText = getGroupDescription(currentDayGroup); } else { - views.dayGroupHeaderVisibility = View.GONE; + viewHolder.dayGroupHeaderVisibility = View.GONE; } - render(views, details, rowId); + render(viewHolder, details, rowId); } } }; - views.asyncTask = loadDataTask; + viewHolder.asyncTask = loadDataTask; mAsyncTaskExecutor.submit(LOAD_DATA_TASK_IDENTIFIER, loadDataTask); } |