From 70bb286f79696fc3a3ee8a57a038a9f56087d902 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Wed, 7 Oct 2015 15:11:22 -0700
Subject: Show blocked contact instead of profile photo.

Does not yet update on change; figuring to do that in a followup
CL because there are a number of other scenarios where that
needs to be fixed too.

Bug: 23943480
Change-Id: I73615c405d547e74667f6c635b5623708c723347
---
 res/drawable-hdpi/ic_block_18dp.png    | Bin 0 -> 392 bytes
 res/drawable-hdpi/ic_block_24dp.png    | Bin 478 -> 0 bytes
 res/drawable-mdpi/ic_block_18dp.png    | Bin 0 -> 268 bytes
 res/drawable-mdpi/ic_block_24dp.png    | Bin 335 -> 0 bytes
 res/drawable-xhdpi/ic_block_18dp.png   | Bin 0 -> 478 bytes
 res/drawable-xhdpi/ic_block_24dp.png   | Bin 665 -> 0 bytes
 res/drawable-xxhdpi/ic_block_18dp.png  | Bin 0 -> 714 bytes
 res/drawable-xxhdpi/ic_block_24dp.png  | Bin 973 -> 0 bytes
 res/drawable-xxxhdpi/ic_block_18dp.png | Bin 0 -> 973 bytes
 res/drawable-xxxhdpi/ic_block_24dp.png | Bin 1295 -> 0 bytes
 res/drawable/blocked_contact.xml       |  27 +++++++++++++++++++++++++++
 res/values/colors.xml                  |   1 +
 12 files changed, 28 insertions(+)
 create mode 100644 res/drawable-hdpi/ic_block_18dp.png
 delete mode 100644 res/drawable-hdpi/ic_block_24dp.png
 create mode 100644 res/drawable-mdpi/ic_block_18dp.png
 delete mode 100644 res/drawable-mdpi/ic_block_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_block_18dp.png
 delete mode 100644 res/drawable-xhdpi/ic_block_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_block_18dp.png
 delete mode 100644 res/drawable-xxhdpi/ic_block_24dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_block_18dp.png
 delete mode 100644 res/drawable-xxxhdpi/ic_block_24dp.png
 create mode 100644 res/drawable/blocked_contact.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_block_18dp.png b/res/drawable-hdpi/ic_block_18dp.png
new file mode 100644
index 000000000..acab511f6
Binary files /dev/null and b/res/drawable-hdpi/ic_block_18dp.png differ
diff --git a/res/drawable-hdpi/ic_block_24dp.png b/res/drawable-hdpi/ic_block_24dp.png
deleted file mode 100644
index 2ccc89d24..000000000
Binary files a/res/drawable-hdpi/ic_block_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_block_18dp.png b/res/drawable-mdpi/ic_block_18dp.png
new file mode 100644
index 000000000..45b83facf
Binary files /dev/null and b/res/drawable-mdpi/ic_block_18dp.png differ
diff --git a/res/drawable-mdpi/ic_block_24dp.png b/res/drawable-mdpi/ic_block_24dp.png
deleted file mode 100644
index ec1b33f0e..000000000
Binary files a/res/drawable-mdpi/ic_block_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_block_18dp.png b/res/drawable-xhdpi/ic_block_18dp.png
new file mode 100644
index 000000000..2ccc89d24
Binary files /dev/null and b/res/drawable-xhdpi/ic_block_18dp.png differ
diff --git a/res/drawable-xhdpi/ic_block_24dp.png b/res/drawable-xhdpi/ic_block_24dp.png
deleted file mode 100644
index 7aba97b65..000000000
Binary files a/res/drawable-xhdpi/ic_block_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_block_18dp.png b/res/drawable-xxhdpi/ic_block_18dp.png
new file mode 100644
index 000000000..1eee12405
Binary files /dev/null and b/res/drawable-xxhdpi/ic_block_18dp.png differ
diff --git a/res/drawable-xxhdpi/ic_block_24dp.png b/res/drawable-xxhdpi/ic_block_24dp.png
deleted file mode 100644
index fddfa54b8..000000000
Binary files a/res/drawable-xxhdpi/ic_block_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_block_18dp.png b/res/drawable-xxxhdpi/ic_block_18dp.png
new file mode 100644
index 000000000..fddfa54b8
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_block_18dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_block_24dp.png b/res/drawable-xxxhdpi/ic_block_24dp.png
deleted file mode 100644
index 0378d1bed..000000000
Binary files a/res/drawable-xxxhdpi/ic_block_24dp.png and /dev/null differ
diff --git a/res/drawable/blocked_contact.xml b/res/drawable/blocked_contact.xml
new file mode 100644
index 000000000..38c0fc92c
--- /dev/null
+++ b/res/drawable/blocked_contact.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/blocked_contact_background" />
+            <size android:width="24dp" android:height="24dp" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_block_18dp" android:gravity="center" />
+</layer-list>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 55970d9e4..a7044c7cb 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -111,6 +111,7 @@
     <color name="divider_line_color">#c7c7c7</color>
 
     <!--  Colors for blocked numbers list -->
+    <color name="blocked_contact_background">#afafaf</color>
     <color name="blocked_number_primary_text_color">@color/dialtacts_primary_text_color</color>
     <color name="blocked_number_secondary_text_color">@color/dialtacts_secondary_text_color</color>
     <color name="delete_icon_tint">#6D6D6D</color>
-- 
cgit v1.2.3