diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-19 12:40:59 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-06-19 20:00:08 +0000 |
| commit | ea7890cd5e829ed3f0b5f726561c569690af2030 (patch) | |
| tree | 235ab5ab9f9215782c29ef350d275fe12e7b2f74 /java/com/android/dialer/calldetails/res/values | |
| parent | 91ce7d2a476bd04fe525049a37a2f8b2824e9724 (diff) | |
Update AOSP Dialer source from internal google3 repository at
cl/159428781.
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/158012278 (6/05/2017) to cl/159428781 (6/19/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.
Merged-In: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030
Change-Id: If1fa394df2609f0d38b4f794c83f4db3f1006484
Diffstat (limited to 'java/com/android/dialer/calldetails/res/values')
| -rw-r--r-- | java/com/android/dialer/calldetails/res/values/strings.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/java/com/android/dialer/calldetails/res/values/strings.xml b/java/com/android/dialer/calldetails/res/values/strings.xml index 6b3b17962..1441efdcd 100644 --- a/java/com/android/dialer/calldetails/res/values/strings.xml +++ b/java/com/android/dialer/calldetails/res/values/strings.xml @@ -27,6 +27,9 @@ <!-- Label for action to edit a number before calling it. [CHAR LIMIT=48] --> <string name="call_details_edit_number">Edit number before call</string> + <!-- Label for action to report a number with inaccurate caller id information. [CHAR LIMIT=48] --> + <string name="call_details_report_call_id">Report inaccurate number</string> + <!-- String shown when the call details show a image that was sent --> <string name="sent_a_photo">Sent a photo</string> @@ -36,10 +39,14 @@ <!-- Messages shown to the user are wrapped in quotes, e.g. the user would see "Some text" --> <string name="message_in_quotes">\"<xliff:g id="message">%1$s</xliff:g>\"</string> - <!-- String describing the button to access the contact details for a name or number. + <!-- Title of dialog that confirms whether a user wants to report an incorrect number. + [CHAR LIMIT=NONE] --> + <string name="report_caller_id_dialog_title">Report incorrect number</string> - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_contact_photo_details">Contact details for <xliff:g id="nameOrNumber">%1$s</xliff:g></string> + <!-- Toast that appears when a caller id report fails to send. Could be due to network error or + authentication error. [CHAR LIMIT=NONE] --> + <string name="report_caller_id_failed">Couldn\'t report number</string> + + <!-- Toast message which appears when a contact's caller id is reported as incorrect. [CHAR LIMIT=NONE] --> + <string name="report_caller_id_toast">Number reported</string> </resources> |