Dialer: blacklisted call tweaks

* Make icon like the missed call icon, but black.
* Also list blacklisted calls in missed calls tab

Change-Id: I0b68325b66b12988f24ff9e4b9570e17f40234b7
Signed-off-by: Roman Birg <roman@cyngn.com>

3 files changed, 18 insertions, 1 deletions

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1a25432cc..dc4c1daec 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -87,6 +87,9 @@
     <!-- Color for missed call icons. -->
     <color name="missed_call">#ff2e58</color>
 
+    <!-- Color for blacklist call icons. -->
+    <color name="blacklisted_call">#ff000000</color>
+
     <!-- Color for answered or outgoing call icons. -->
     <color name="answered_call">@color/dialer_green_highlight_color</color>
 
diff --git a/src/com/android/dialer/calllog/CallLogQueryHandler.java b/src/com/android/dialer/calllog/CallLogQueryHandler.java
index 04c865ca4..293c21e7c 100755
--- a/src/com/android/dialer/calllog/CallLogQueryHandler.java
+++ b/src/com/android/dialer/calllog/CallLogQueryHandler.java
@@ -178,6 +178,12 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
             where.append(String.format("(%s = ?)", Calls.TYPE));
             // Add a clause to fetch only items newer than the requested date
             selectionArgs.add(Integer.toString(callType));
+            if (callType == Calls.MISSED_TYPE) {
+                // also query for blacklisted calls as they are 'missed'
+                where.append(" OR ");
+                where.append(String.format("(%s = ?)", Calls.TYPE));
+                selectionArgs.add(Integer.toString(Calls.BLACKLIST_TYPE));
+            }
         }
 
         if (newerThan > 0) {
@@ -219,6 +225,12 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
             where.append(String.format("(%s = ?)", Calls.TYPE));
             // Add a clause to fetch only items newer than the requested date
             selectionArgs.add(Integer.toString(callType));
+            if (callType == Calls.MISSED_TYPE) {
+                // also query for blacklisted calls as they are 'missed'
+                where.append(" OR ");
+                where.append(String.format("(%s = ?)", Calls.TYPE));
+                selectionArgs.add(Integer.toString(Calls.BLACKLIST_TYPE));
+            }
         }
 
         if (slotId > CALL_SUB_ALL) {
diff --git a/src/com/android/dialer/calllog/CallTypeIconsView.java b/src/com/android/dialer/calllog/CallTypeIconsView.java
index 719551320..eb7247416 100755
--- a/src/com/android/dialer/calllog/CallTypeIconsView.java
+++ b/src/com/android/dialer/calllog/CallTypeIconsView.java
@@ -210,8 +210,10 @@ public class CallTypeIconsView extends View {
             // above will be recolored here.
             missed = r.getDrawable(R.drawable.ic_call_arrow).mutate();
             missed.setColorFilter(r.getColor(R.color.missed_call), PorterDuff.Mode.MULTIPLY);
+
             blacklist = r.getDrawable(R.drawable.ic_call_arrow).mutate();
-            blacklist.setColorFilter(0x000, PorterDuff.Mode.MULTIPLY);
+            blacklist.setColorFilter(r.getColor(R.color.blacklisted_call), PorterDuff.Mode.MULTIPLY);
+
             voicemail = r.getDrawable(R.drawable.ic_call_voicemail_holo_dark);
 
             // Get the video call icon, scaled to match the height of the call arrows.