diff options
| author | Tyler Gunn <tgunn@google.com> | 2017-05-03 21:37:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-03 21:37:01 +0000 |
| commit | 9daa42dceb2d8fe3d7fad7fde6cc7d8a9aa0fb97 (patch) | |
| tree | 1db4bc78bbed6f93b23e89ee9b0a1f45b38c7a14 /res | |
| parent | 0ac2ca56f70f1e007e675920cc16cf0b99c96c45 (diff) | |
| parent | ba03779236612e3c3cfc74a32cbffbd6c7cf119c (diff) | |
| download | android_packages_services_Telecomm-9daa42dceb2d8fe3d7fad7fde6cc7d8a9aa0fb97.tar.gz android_packages_services_Telecomm-9daa42dceb2d8fe3d7fad7fde6cc7d8a9aa0fb97.tar.bz2 android_packages_services_Telecomm-9daa42dceb2d8fe3d7fad7fde6cc7d8a9aa0fb97.zip | |
Merge "Confirm managed call when there are ongoing self-managed calls." into oc-dev
am: ba03779236
Change-Id: Ie9c99152af59dab4225a911285fcd6005248a1d6
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 2363a1df..58e5284a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -252,4 +252,8 @@ <string name="notification_channel_incoming_call">Incoming calls</string> <!-- Notification channel name for a channel containing missed call notifications. --> <string name="notification_channel_missed_call">Missed calls</string> + + <!-- Alert dialog content used to inform the user that placing a new outgoing call will end the + ongoing call in the app "other_app". --> + <string name="alert_outgoing_call">Placing this call will end your <xliff:g id="other_app">%1$s</xliff:g> call.</string> </resources> |