diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-04-01 10:23:42 -0700 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2016-05-12 20:18:17 +0000 |
| commit | ad944e7cf20303adddd960d8870b47fffcdcc8df (patch) | |
| tree | 69d708030d30f4b554cc62b5dc988b1b0443e4da /InCallUI/res | |
| parent | e778d9fecead62e01a2696345934d1ee71e0bbe5 (diff) | |
DO NOT MERGE Add support for multi-endpoint.
- Add new "ExternalCallNotifier" which tracks external calls that Telecom
informs Incall about.
- Refactored some common code from StatusBarNotifier that is used in
ExternalCallNotifier into NotificationUtil so it can be used in both
places.
- Modified CallList to track and store external calls seperately from
regular ones.
- Added support for triggering a call pull in the
NotificationBroadcastReceiver.
Bug: 27458894
Change-Id: I505c8b5f7aad273ebdaaeae2431564d10b23770b
(cherry picked from commit d8eb77f116ba21a4f40fd59d608b2e8bbdf2e09b)
Diffstat (limited to 'InCallUI/res')
| -rw-r--r-- | InCallUI/res/values/strings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 7701cdb2d..84eb14c0a 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -218,6 +218,17 @@ The user will be able to send text messages using the phone number. [CHAR LIMIT=12] --> <string name="notification_missedCall_message">Message</string> + <!-- The "label" of the in-call Notification for an ongoing external call. + External calls are a representation of a call which is in progress on the user's other + device (e.g. another phone or a watch). + [CHAR LIMIT=60] --> + <string name="notification_external_call">Ongoing call on another device</string> + <!-- Notification action displayed for external call notifications. External calls are a + representation of a call which is in progress on the user's other device (e.g. another + phone or a watch). The "transfer call" action initiates the process of transferring an + external call to the current device. + [CHAR LIMIT=30] --> + <string name="notification_transfer_call">Transfer Call</string> <!-- In-call screen: call failure message displayed in an error dialog --> <string name="incall_error_power_off">To place a call, first turn off Airplane mode.</string> |