diff options
author | Andrew Lee <anwlee@google.com> | 2015-10-12 18:44:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-12 18:44:05 +0000 |
commit | cc537470e9b87878982b429c4173a21481e253c7 (patch) | |
tree | 478542e57c7fe4ced1ee40841103562b6316d4e3 /res | |
parent | ab84df38a2832eae3eec9af494af587bbd03f79a (diff) | |
parent | d156342c43389367c4528fb395fe3542bfe8d60e (diff) |
am d156342c: Merge "Show blocked contact instead of profile photo." into ub-contactsdialer-a-dev
* commit 'd156342c43389367c4528fb395fe3542bfe8d60e':
Show blocked contact instead of profile photo.
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_block_18dp.png | bin | 0 -> 392 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_block_18dp.png | bin | 0 -> 268 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_block_24dp.png | bin | 335 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_block_18dp.png (renamed from res/drawable-hdpi/ic_block_24dp.png) | bin | 478 -> 478 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_block_24dp.png | bin | 665 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_block_18dp.png | bin | 0 -> 714 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ic_block_18dp.png (renamed from res/drawable-xxhdpi/ic_block_24dp.png) | bin | 973 -> 973 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ic_block_24dp.png | bin | 1295 -> 0 bytes | |||
-rw-r--r-- | res/drawable/blocked_contact.xml | 27 | ||||
-rw-r--r-- | res/values/colors.xml | 1 |
10 files changed, 28 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_block_18dp.png b/res/drawable-hdpi/ic_block_18dp.png Binary files differnew file mode 100644 index 000000000..acab511f6 --- /dev/null +++ b/res/drawable-hdpi/ic_block_18dp.png diff --git a/res/drawable-mdpi/ic_block_18dp.png b/res/drawable-mdpi/ic_block_18dp.png Binary files differnew file mode 100644 index 000000000..45b83facf --- /dev/null +++ b/res/drawable-mdpi/ic_block_18dp.png diff --git a/res/drawable-mdpi/ic_block_24dp.png b/res/drawable-mdpi/ic_block_24dp.png Binary files differdeleted file mode 100644 index ec1b33f0e..000000000 --- a/res/drawable-mdpi/ic_block_24dp.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_block_24dp.png b/res/drawable-xhdpi/ic_block_18dp.png Binary files differindex 2ccc89d24..2ccc89d24 100644 --- a/res/drawable-hdpi/ic_block_24dp.png +++ b/res/drawable-xhdpi/ic_block_18dp.png diff --git a/res/drawable-xhdpi/ic_block_24dp.png b/res/drawable-xhdpi/ic_block_24dp.png Binary files differdeleted file mode 100644 index 7aba97b65..000000000 --- a/res/drawable-xhdpi/ic_block_24dp.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_block_18dp.png b/res/drawable-xxhdpi/ic_block_18dp.png Binary files differnew file mode 100644 index 000000000..1eee12405 --- /dev/null +++ b/res/drawable-xxhdpi/ic_block_18dp.png diff --git a/res/drawable-xxhdpi/ic_block_24dp.png b/res/drawable-xxxhdpi/ic_block_18dp.png Binary files differindex fddfa54b8..fddfa54b8 100644 --- a/res/drawable-xxhdpi/ic_block_24dp.png +++ b/res/drawable-xxxhdpi/ic_block_18dp.png diff --git a/res/drawable-xxxhdpi/ic_block_24dp.png b/res/drawable-xxxhdpi/ic_block_24dp.png Binary files differdeleted file mode 100644 index 0378d1bed..000000000 --- a/res/drawable-xxxhdpi/ic_block_24dp.png +++ /dev/null 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> |