Tweak block number UI
Bug:25455707
Change-Id: I374a200d1332addfb321dd16eb52b779c3754159
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e927f74..75d05ac 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -121,20 +121,20 @@
<color name="floating_action_button_touch_tint">#80ffffff</color>
<color name="call_log_action_divider">#eeeeee</color>
- <color name="divider_line_color">#c7c7c7</color>
+ <color name="divider_line_color">#D8D8D8</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="blocked_number_icon_tint">#616161</color>
- <color name="blocked_number_background">#E0E0E0</color>
+ <color name="blocked_number_background">#FFFFFF</color>
<color name="blocked_number_accent_color">#42A5F5</color>
<color name="blocked_number_block_color">#F44336</color>
<color name="blocked_number_header_color">@color/dialer_theme_color</color>
<color name="blocked_number_disabled_emergency_header_color">#616161</color>
+ <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color>
<color name="add_blocked_number_icon_color">#bdbdbd</color>
-
<!-- Grey 700 -->
<color name="call_detail_footer_text_color">#616161</color>
<color name="call_detail_footer_icon_tint">@color/call_detail_footer_text_color</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 18f33d5..4865280 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -160,11 +160,14 @@
<dimen name="blocked_number_horizontal_margin">16dp</dimen>
<dimen name="blocked_number_top_margin">16dp</dimen>
<dimen name="blocked_number_bottom_margin">16dp</dimen>
+ <dimen name="blocked_number_add_top_margin">8dp</dimen>
+ <dimen name="blocked_number_add_bottom_margin">8dp</dimen>
<dimen name="blocked_number_primary_text_size">16sp</dimen>
<dimen name="blocked_number_secondary_text_size">12sp</dimen>
<dimen name="blocked_number_delete_icon_size">32dp</dimen>
<dimen name="blocked_number_search_text_size">14sp</dimen>
- <dimen name="blocked_number_settings_description_text_size">16sp</dimen>
+ <dimen name="blocked_number_settings_description_text_size">14sp</dimen>
+ <dimen name="blocked_number_header_height">48dp</dimen>
<dimen name="call_type_icon_size">12dp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d79d9d..2838e68 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -526,13 +526,13 @@
<!-- Confirmation dialog message for blocking a number with visual voicemail active.
[CHAR LIMIT=NONE] -->
<string name="block_number_confirmation_message_vvm">
- Future calls from this number will be blocked and voicemails will be automatically deleted.
+ Calls from this number will be blocked and voicemails will be automatically deleted.
</string>
<!-- Confirmation dialog message for blocking a number with no visual voicemail.
[CHAR LIMIT=NONE] -->
<string name="block_number_confirmation_message_no_vvm">
- Future calls from this number will be blocked. Voicemails may still reach you.
+ Calls from this number will be blocked, but the caller may still be able to leave you voicemails.
</string>
<!-- Block number alert dialog button [CHAR LIMIT=32] -->
@@ -898,13 +898,13 @@
<!-- Footer message of number blocking screen with visual voicemail active.
[CHAR LIMIT=NONE] -->
<string name="block_number_footer_message_vvm">
- Adding a number blocks all future calls and voicemails will be automatically deleted.
+ Calls from these numbers will be blocked and voicemails will be automatically deleted.
</string>
<!-- Footer message of number blocking screen with no visual voicemail.
[CHAR LIMIT=NONE] -->
<string name="block_number_footer_message_no_vvm">
- Adding a number blocks all future calls. Voicemails may still reach you.
+ Calls from these numbers will be blocked, but they may still be able to leave you voicemails.
</string>
<!-- Heading for the block list in the "Spam and blocked cal)ls" settings. [CHAR LIMIT=64] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d3d160d..8c27265 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -319,7 +319,7 @@
</style>
<style name="BlockedNumbersDescriptionTextStyle">
- <item name="android:lineSpacingMultiplier">1.2</item>
+ <item name="android:lineSpacingMultiplier">1.43</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>