diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-09-18 16:12:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-18 16:12:25 +0000 |
| commit | 73d2492409aed01f6fc0451e694cffe763585e08 (patch) | |
| tree | ec1d346a6ca352e97edff1cad8737895945e3b80 | |
| parent | c32c359ac225ff55dc4f69158dc2d99308eaeffd (diff) | |
| parent | 3cd4d8753c96e9ba85422bbda54538720d7cd190 (diff) | |
Merge "Update colors in Dialer for GAR requirements" into lmp-dev
| -rw-r--r-- | res/layout/recents_list_footer.xml | 2 | ||||
| -rw-r--r-- | res/values/colors.xml | 9 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/res/layout/recents_list_footer.xml b/res/layout/recents_list_footer.xml index 7670d81bb..3a56cbe16 100644 --- a/res/layout/recents_list_footer.xml +++ b/res/layout/recents_list_footer.xml @@ -27,7 +27,7 @@ android:gravity="center" android:fontFamily="@string/view_full_call_history_font_family" android:textStyle="bold" - android:textColor="@color/view_full_call_history_color" + android:textColor="@color/dialtacts_secondary_text_color" android:textSize="14sp" android:text="@string/recents_footer_text" android:background="@drawable/recent_lists_footer_background" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index a3fd3f923..d5ec4dcc3 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -16,16 +16,16 @@ <resources> <!-- Primary text color in the Dialer --> - <color name="dialtacts_primary_text_color">#333</color> + <color name="dialtacts_primary_text_color">#333333</color> <!-- Secondary text color in the Dialer --> <color name="dialtacts_secondary_text_color">#737373</color> <color name="dialer_red_highlight_color">#ff1744</color> <color name="dialer_green_highlight_color">#00c853</color> <!-- Color for the setting text. --> - <color name="setting_primary_color">#4d4c4c</color> + <color name="setting_primary_color">@color/dialtacts_primary_text_color</color> <!-- Color for the setting description text. --> - <color name="setting_secondary_color">#989898</color> + <color name="setting_secondary_color">@color/dialtacts_secondary_text_color</color> <color name="setting_background_color">#ffffff</color> <!-- Color of the text describing an unconsumed missed call. --> @@ -87,9 +87,6 @@ as call back, play voicemail, etc. --> <color name="call_log_action_text">@color/dialer_theme_color</color> - <!-- Color of view full call history item text. --> - <color name="view_full_call_history_color">@color/dialer_theme_color</color> - <!-- Color for missed call icons. --> <color name="missed_call">#ff2e58</color> diff --git a/res/values/styles.xml b/res/values/styles.xml index 6fc9cf419..a0ba5c32a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -164,9 +164,9 @@ <!-- Style applied to the "Settings" screen. Keep in sync with SettingsLight in Telephony. --> <style name="SettingsStyle" parent="DialtactsThemeWithoutActionBarOverlay"> <!-- Setting text. --> - <item name="android:textColorSecondary">@color/setting_primary_color</item> + <item name="android:textColor">@color/setting_primary_color</item> <!-- Setting description. --> - <item name="android:textColorTertiary">@color/setting_secondary_color</item> + <item name="android:textColorSecondary">@color/setting_secondary_color</item> <item name="android:windowBackground">@color/setting_background_color</item> <item name="android:colorAccent">@color/dialtacts_theme_color</item> <item name="android:textColorLink">@color/dialtacts_theme_color</item> |