diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-07-28 18:49:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 18:49:30 +0000 |
| commit | b0e1b80981ef84062aec48ce2362b727b5149769 (patch) | |
| tree | 11605734cddc137b3dd994da22aad0b043dd00de /InCallUI/res | |
| parent | 8a8b96160d239433ec3bd62af232dfe1dbc92846 (diff) | |
| parent | 1b4f2ec8501a83675489ecba4282f0744df8f340 (diff) | |
am 0be02352: am 57b6c31f: am 4db859b7: am e182bb44: Merge "Add support for showing child number in incall ui." into mnc-dr-dev
* commit '0be0235249131b564482bc52c6017dd0699e9418':
Add support for showing child number in incall ui.
Diffstat (limited to 'InCallUI/res')
| -rw-r--r-- | InCallUI/res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index cadef732b..15cba1f32 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -456,4 +456,8 @@ <!-- Description of the "camera off" icon displayed when the device's camera is disabled during a video call. [CHAR LIMIT=NONE] --> <string name="camera_off_description">Camera off</string> + + <!-- Used to inform the user that a call was received via a number other than the primary + phone number associated with their device. [CHAR LIMIT=16] --> + <string name="child_number">via <xliff:g id="child_number" example="650-555-1212">%s</xliff:g></string> </resources> |