diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-14 11:42:35 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-14 11:42:35 -0700 |
| commit | c23e43ce9da8cffb339dbfa6e2899432af28ca3d (patch) | |
| tree | eba22a024343ca7f0b812209e760394bf5394131 /InCallUI | |
| parent | 2d5ae3d73c5d5eb382d542aff6cfd632dadf1654 (diff) | |
| parent | c52ad65afa67bec7b083299714ee624cd94ecef3 (diff) | |
resolved conflicts for merge of 13381079 to master
Change-Id: Iba11dc459f0d0e288b1749d2ea912dbd928e140d
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | InCallUI/res/values/strings.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index 5c2ad4e46..ffc1518fd 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -53,6 +53,8 @@ <!-- 25% opacity, white. --> <color name="button_disabled_color">#40ffffff</color> + <color name="wifi_connected_background">#8099cc00</color> + <!-- Background color of action bars --> <color name="actionbar_background_color">#3B77E7</color> diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 0c5d6357c..ff004df7c 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -493,6 +493,8 @@ <!-- This can be used in any application wanting to disable the text "Emergency number" --> <string name="emergency_call_dialog_number_for_display">Emergency number</string> + <string name="in_call_wifi_connected">Connected via <xliff:g id="wifi_ssid">%s</xliff:g></string> + <!-- The digit to be displayed on the 0 key of the dialpad [CHAR LIMIT=1]--> <string name="dialpad_0_number">0</string> <!-- The digit to be displayed on the 1 key of the dialpad [CHAR LIMIT=1]--> |