summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAnne Rong <annerong@google.com>2015-10-02 23:50:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-02 23:50:21 +0000
commit1113dce12c937f5b9481a18ca65fb1ea3bf49138 (patch)
treef1627d00f7e6f691c1e9d65a6ee7e225d06eb868 /res
parent1695b1ac3682c6a7dd6d1ff898673237a6a37512 (diff)
parent6a9fe7f962bafdd3aa68cbf01cb3372fca0514a8 (diff)
am 6a9fe7f9: Merge "Add blocked number indicator to search screen for adding a blocked number." into ub-contactsdialer-a-dev
* commit '6a9fe7f962bafdd3aa68cbf01cb3372fca0514a8': Add blocked number indicator to search screen for adding a blocked number.
Diffstat (limited to 'res')
-rw-r--r--res/values/colors.xml1
-rw-r--r--res/values/ids.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ad493e147..e80ee6913 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -111,6 +111,7 @@
<color name="delete_icon_tint">#6D6D6D</color>
<color name="blocked_number_background">#E0E0E0</color>
<color name="blocked_number_accent_color">#42A5F5</color>
+ <color name="blocked_number_block_color">#F44336</color>
<!-- Colors for onboarding flow -->
<color name="onboarding_primary_text_color">#ffffff</color>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 14a2e5980..f850327ea 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -21,4 +21,5 @@
<item type="id" name="context_menu_edit_before_call" />
<item type="id" name="context_menu_block_number" />
<item type="id" name="settings_header_sounds_and_vibration" />
+ <item type="id" name="block_id" />
</resources>