diff options
author | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
commit | d8046e520a866b9948ee9ba47cf642b441ca8e23 (patch) | |
tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/incallui/res/values/strings.xml | |
parent | cdb1edf966a892abebcba425a85b7d4e47758302 (diff) |
Update AOSP Dialer source from internal google3 repository at
cl/152373142.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217
Diffstat (limited to 'java/com/android/incallui/res/values/strings.xml')
-rw-r--r-- | java/com/android/incallui/res/values/strings.xml | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml index 0b95a9cc6..18d593091 100644 --- a/java/com/android/incallui/res/values/strings.xml +++ b/java/com/android/incallui/res/values/strings.xml @@ -86,6 +86,42 @@ <string name="notification_on_hold">On hold</string> <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] --> <string name="notification_incoming_call">Incoming call</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] --> + <string name="notification_incoming_call_with_photo">Incoming call with photo</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] --> + <string name="notification_incoming_call_with_message">Incoming call with message</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] --> + <string name="notification_incoming_call_with_location">Incoming call with location</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." --> + <string name="notification_incoming_call_with_photo_message">Incoming call with photo and message</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." --> + <string name="notification_incoming_call_with_photo_location">Incoming call with photo and location</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." --> + <string name="notification_incoming_call_with_message_location">Incoming call with message and location</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." --> + <string name="notification_incoming_call_with_photo_message_location">Incoming call with photo, message and location</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] --> + <string name="notification_incoming_call_attachments">Incoming call with attachments</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] --> + <string name="important_notification_incoming_call">Important incoming call</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". --> + <string name="important_notification_incoming_call_with_photo">Important incoming call with photo</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". --> + <string name="important_notification_incoming_call_with_message">Important incoming call with message</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". --> + <string name="important_notification_incoming_call_with_location">Important incoming call with location</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." --> + <string name="important_notification_incoming_call_with_photo_message">Important incoming call with photo and message</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." --> + <string name="important_notification_incoming_call_with_photo_location">Important incoming call with photo and location</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." --> + <string name="important_notification_incoming_call_with_message_location">Important incoming call with message and location</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". If still can't meet, replace with "Incoming call with attachments." --> + <string name="important_notification_incoming_call_with_photo_message_location">Important incoming call with photo, message and location</string> + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=50] If can't meet limit, remove "Incoming". --> + <string name="important_notification_incoming_call_attachments">Important incoming call with attachments</string> + + <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] --> <string name="notification_incoming_work_call">Incoming work call</string> <!-- The "label" of the in-call Notification for an incoming ringing call, |