summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-10-20 21:20:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-20 21:20:49 +0000
commitb2ae1410907a622c59175f821d07d3c936b2882c (patch)
tree198a42611fdeb361d452d880a9c03e532d1e2d12 /res/values
parent87013734468f26070c2b07bf6d98ba4500abccd7 (diff)
parentb980fc4386cdc24a605fc682d0fef0c5dc54c327 (diff)
downloadandroid_packages_apps_Dialer-b2ae1410907a622c59175f821d07d3c936b2882c.tar.gz
android_packages_apps_Dialer-b2ae1410907a622c59175f821d07d3c936b2882c.tar.bz2
android_packages_apps_Dialer-b2ae1410907a622c59175f821d07d3c936b2882c.zip
Merge "Add setting for hiding blocked calls." into ub-contactsdialer-a-dev
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/values/styles.xml7
2 files changed, 13 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0b7d82c61..333a99be4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -833,6 +833,12 @@
You previously marked some callers to be automatically sent to voicemail via other apps.
</string>
+ <!-- Text for a setting to hide blocked calls and automatically delete voicemail from block
+ numbers. [CHAR LIMIT=NONE] -->
+ <string name="blocked_call_settings_hide_setting">
+ Hide calls and delete voicemails from blocked numbers.
+ </string>
+
<!-- Label for button to view numbers of contacts previous marked to be sent to voicemail.
[CHAR_LIMIT=20] -->
<string name="blocked_call_settings_view_numbers_button">View Numbers</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7828a20f1..533b88edd 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -324,4 +324,11 @@
<item name="android:paddingStart">@dimen/button_horizontal_padding</item>
<item name="android:textColor">@color/dialer_flat_button_text_color</item>
</style>
+
+ <style name="BlockedNumbersDescriptionTextStyle">
+ <item name="android:lineSpacingMultiplier">1.2</item>
+ <item name="android:paddingTop">8dp</item>
+ <item name="android:paddingBottom">8dp</item>
+ <item name="android:textSize">@dimen/blocked_number_settings_description_text_size</item>
+ </style>
</resources>