diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-07-16 00:06:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-15 16:05:07 +0000 |
| commit | a5b475bbc4a0a41c3d0d8fc31b955e1fd96b1c9f (patch) | |
| tree | adeffa3f76467b51a8ec3040327245910e14c2b8 /res/values | |
| parent | 9072432dbf1d46aaeed2c02f48af925b393457bb (diff) | |
| parent | af6f195af0bb200d1bb06ad11dac476e8dff0073 (diff) | |
Merge "Make ContactPreferences use SharedPreferences instead of System settings (5/5)" into lmp-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 12 | ||||
| -rw-r--r-- | res/values/styles.xml | 9 |
3 files changed, 25 insertions, 2 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 6624c2d80..cbf737cb2 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -21,6 +21,12 @@ <color name="dialtacts_secondary_text_color">#888888</color> <color name="dialer_accent_color">#eeff41</color> + <!-- Color for the setting text. --> + <color name="setting_primary_color">#4d4c4c</color> + <!-- Color for the setting description text. --> + <color name="setting_secondary_color">#989898</color> + <color name="setting_background_color">#ffffff</color> + <!-- Color of the text describing an unconsumed missed call. --> <color name="call_log_missed_call_highlight_color">#FF0000</color> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8375df8a0..17984fd26 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -329,8 +329,8 @@ <!-- Menu item to select account used to make phone calls [CHAR LIMIT=30] --> <string name="menu_select_account">Select Account</string> - <!-- Menu item label for call settings [CHAR LIMIT=30] --> - <string name="call_settings">Settings</string> + <!-- Label for the dialer app setting page [CHAR LIMIT=30]--> + <string name="dialer_settings_label">Settings</string> <!-- Menu item to create a new contact [CHAR LIMIT=30] --> <string name="menu_newContact">New contact</string> @@ -743,4 +743,12 @@ <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] --> <string name="list_delimeter">", "</string> + + <!-- Dialer settings related strings--> + + <!-- Label for the call settings section [CHAR LIMIT=30]--> + <string name="call_settings_label">Call Settings</string> + + <!-- Label for the call settings section description [CHAR LIMIT=80]--> + <string name="call_settings_description">Ringtones, voicemail settings, VoIP calling, etc</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 19f897e8b..5df218b16 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -151,4 +151,13 @@ <item name="android:paddingLeft">@dimen/dismiss_button_padding_start</item> <item name="android:paddingRight">@dimen/dismiss_button_padding_end</item> </style> + + <!-- 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> + <!-- Setting description. --> + <item name="android:textColorTertiary">@color/setting_secondary_color</item> + <item name="android:windowBackground">@color/setting_background_color</item> + </style> </resources> |