diff options
| author | Ta-wei Yen <twyen@google.com> | 2016-03-21 19:05:13 -0700 |
|---|---|---|
| committer | Ta-wei Yen <twyen@google.com> | 2016-03-21 19:05:13 -0700 |
| commit | 4b2472a2bc65ef89a5a325e23c13b33358a16a9a (patch) | |
| tree | 352c77617664769f41feac87b3a4286b1e932096 /src/com | |
| parent | 12c93d5a6e63d9cd4d8457551d41056ae12cd16c (diff) | |
Fix merge
Merge in ag/886674 was done incorrectly on CallLogAdapter.
This CL revert the changes.
Change-Id: I1779c205f9be8250acd5a4455608b857c6198663
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 3f41b1c1f..165594efa 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -178,6 +178,9 @@ public class CallLogAdapter extends GroupingListAdapter } else { if (viewHolder.callType == CallLog.Calls.MISSED_TYPE) { CallLogAsyncTaskUtil.markCallAsRead(mContext, viewHolder.callIds); + if (mActivityType == ACTIVITY_TYPE_DIALTACTS) { + ((DialtactsActivity) v.getContext()).updateTabUnreadCounts(); + } } expandViewHolderActions(viewHolder); } @@ -522,10 +525,7 @@ public class CallLogAdapter extends GroupingListAdapter details.features = getCallFeatures(c, count); details.geocode = c.getString(CallLogQuery.GEOCODED_LOCATION); details.transcription = c.getString(CallLogQuery.TRANSCRIPTION); - if (details.callTypes[0] == CallLog.Calls.VOICEMAIL_TYPE || - details.callTypes[0] == CallLog.Calls.MISSED_TYPE) { - details.isRead = c.getInt(CallLogQuery.IS_READ) == 1; - } + details.callTypes = getCallTypes(c, count); if (!c.isNull(CallLogQuery.DATA_USAGE)) { details.dataUsage = c.getLong(CallLogQuery.DATA_USAGE); |