diff options
| author | Mohamed <abdalkader@google.com> | 2016-02-24 17:06:20 -0800 |
|---|---|---|
| committer | Mohamed <abdalkader@google.com> | 2016-02-25 15:05:48 -0800 |
| commit | 97610cbec4ccf87318ebdca3797f18a84cf87ca5 (patch) | |
| tree | fca535117115d37e8449b570d592ab2b680750ae /res/values | |
| parent | 5a002ca9c4906554102dfea650b57d530328a232 (diff) | |
| download | platform_packages_services_Telecomm-97610cbec4ccf87318ebdca3797f18a84cf87ca5.tar.gz platform_packages_services_Telecomm-97610cbec4ccf87318ebdca3797f18a84cf87ca5.tar.bz2 platform_packages_services_Telecomm-97610cbec4ccf87318ebdca3797f18a84cf87ca5.zip | |
Add butter bar when blocking is suppressed.
Screenshots:
https://drive.google.com/a/google.com/file/d/0ByV4lfyID02GTVJkei1GMWpSYXpHRlJPNG1yVHpoLUltWTNZ/view?usp=sharing
https://drive.google.com/a/google.com/file/d/0ByV4lfyID02GZGsyRm91anJoT1pHdjFreHhISnR6UXhUcHBV/view?usp=sharing
Bug: 26917087
Change-Id: I83ae16b7d869f342056403e0da41d23b4fc23448
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 5 | ||||
| -rw-r--r-- | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | res/values/styles.xml | 12 |
4 files changed, 26 insertions, 1 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 64db08524..75b8352e9 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,4 +20,9 @@ <color name="dialer_settings_actionbar_text_color">#ffffff</color> <color name="dialer_settings_actionbar_background_color">@color/theme_color</color> <color name="dialer_settings_color_dark">#0277bd</color> + + <color name="blocked_numbers_divider_color">#e5e5e5</color> + <color name="blocked_numbers_butter_bar_color">#f5f5f5</color> + <color name="blocked_numbers_title_text_color">#ba000000</color> + <color name="blocked_numbers_secondary_text_color">#89000000</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index f2b1f5f0d..be772206d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -26,5 +26,8 @@ <dimen name="blocked_numbers_delete_icon_size">24dp</dimen> <dimen name="blocked_numbers_progress_bar_padding">100dp</dimen> <dimen name="blocked_numbers_font_size">16sp</dimen> + <dimen name="blocked_numbers_secondary_font_size">14sp</dimen> <dimen name="blocked_numbers_line_spacing">8sp</dimen> + <dimen name="blocked_numbers_secondary_line_spacing">6sp</dimen> + <dimen name="blocked_numbers_divider_stroke">1dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index f1dd67bb6..22e0adfd7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -137,6 +137,13 @@ <string name="non_primary_user">Only the device owner can view and manage blocked numbers.</string> <!-- Description of icon to delete blocked number. --> <string name="delete_icon_description">Tab to unblock</string> + <!-- Title for butter bar shown when call blocking is disabled. --> + <string name="blocked_numbers_butter_bar_title">Blocking temporarily off</string> + <!-- Explanation for butter bar shown when call blocking is disabled. --> + <string name="blocked_numbers_butter_bar_body">After you dial or text an emergency number, blocking is turned off to ensure that emergency services can contact you.</string> + <!-- Button to re-enable blocking shown in butter bar shown when call blocking is disabled. --> + <string name="blocked_numbers_butter_bar_button">Re-enable now</string> + <!-- DO NOT TRANSLATE. Label for test Subscription 0. --> <string name="test_account_0_label">Q Mobile</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 6760bf700..29c556689 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -59,7 +59,7 @@ <item name="android:src">@drawable/ic_more_vert_24dp</item> </style> - <style name="BlockedNumbersAddButton"> + <style name="BlockedNumbersButton"> <item name="android:textColor">@color/theme_color</item> <item name="android:textSize">@dimen/blocked_numbers_font_size</item> <item name="android:textAllCaps">true</item> @@ -69,4 +69,14 @@ <item name="android:textSize">@dimen/blocked_numbers_font_size</item> <item name="android:lineSpacingExtra">@dimen/blocked_numbers_line_spacing</item> </style> + + <style name="BlockedNumbersTitleText" parent="BlockedNumbersText"> + <item name="android:textColor">@color/blocked_numbers_title_text_color</item> + </style> + + <style name="BlockedNumbersSecondaryText"> + <item name="android:textColor">@color/blocked_numbers_secondary_text_color</item> + <item name="android:textSize">@dimen/blocked_numbers_secondary_font_size</item> + <item name="android:lineSpacingExtra">@dimen/blocked_numbers_secondary_line_spacing</item> + </style> </resources> |