diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-13 16:42:42 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-13 16:42:42 -0700 |
| commit | 9d180ef424cdefd81c2e854f75d453d4944312f2 (patch) | |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | c836f76cd86d0e11410d9a5c2710a305847d6cd3 (diff) | |
| parent | 277ae05e6fe95c147de3dba4f50c34684f0766d8 (diff) | |
resolved conflicts for merge of 277ae05e to master
Change-Id: Ibaedc14b791fb28f45963fbcededc37840965627
| -rw-r--r-- | res/values/colors.xml | 12 | ||||
| -rw-r--r-- | res/values/strings.xml | 22 |
2 files changed, 34 insertions, 0 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 70adb36ac..4874e1f68 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -69,6 +69,18 @@ <!-- Text color for no favorites message --> <color name="nofavorite_text_color">#777777</color> + <!-- Background color of wifi highlight items --> + <color name="background_wifi_highlight">#99cc00</color> + + <!-- Foreground color of wifi highlight items --> + <color name="foreground_wifi_highlight">#ffffff</color> + + <!-- Dark (e.g. border) regions of wifi highlight items --> + <color name="wifi_dark_wifi_highlight">#009900</color> + + <!-- Generic separator color for wifi list items --> + <color name="wifi_list_separator">#909090</color> + <!-- Text color for the "Remove" text in its regular state --> <color name="remove_text_color">#555555</color> diff --git a/res/values/strings.xml b/res/values/strings.xml index ecf190a8a..d6d4766fe 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -620,6 +620,28 @@ <!-- Remove button that shows up when contact is long-pressed. [CHAR LIMIT=NONE] --> <string name="remove_contact">Remove</string> + <string name="wifi_no_signal_no_problem">No Signal? No Problem.</string> + + <string name="wifi_enable_google_wifi_calling">Enable Google Wi-Fi Calling</string> + + <string name="wifi_when_connected_to_a_signal">When connected to a strong Wi-Fi signal:</string> + + <string name="wifi_always_use_wifi">Always use Wi-Fi to make calls</string> + + <string name="wifi_ask_use_wifi">Always ask</string> + + <string name="wifi_never_use_wifi">Never use Wi-Fi to make calls</string> + + <string name="wifi_next_setup_screen">Next</string> + + <string name="wifi_previous_setup_screen">Back</string> + + <string name="wifi_setup_completed">Boom. Wi-Fi calling is all set up. You can change your preferences or turn it off anytime in settings.</string> + + <string name="wifi_setup_ok">Ok, got it</string> + + <string name="wifi_setup_settings_shortcut">Call settings</string> + <!-- Header text displayed on the main dialer screen above the list of favorite phone numbers. [CHAR LIMIT=21] --> <string name="favorites_menu_speed_dial">Speed Dial</string> |