diff options
author | Eric Erfanian <erfanian@google.com> | 2017-06-22 10:19:53 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-06-22 10:19:53 -0700 |
commit | 3bb96412f546ce1230cc9e984bd331642ce2e928 (patch) | |
tree | 822b74ccafc861482aa987e135adb5eff6f3d312 /java/com/android/dialer/app/res/values/strings.xml | |
parent | ecc0957193e971e8f94f39efdbb37b0e4ed4f988 (diff) | |
download | android_packages_apps_Dialer-3bb96412f546ce1230cc9e984bd331642ce2e928.tar.gz android_packages_apps_Dialer-3bb96412f546ce1230cc9e984bd331642ce2e928.tar.bz2 android_packages_apps_Dialer-3bb96412f546ce1230cc9e984bd331642ce2e928.zip |
Manually integrate upstream oc-dr1-dev changes.
https://googleplex-android-review.git.corp.google.com/#/c/2446830/
Test: TH, make
Change-Id: I39aba7e972bac6e5864e70ed693849d90ecd7e08
Diffstat (limited to 'java/com/android/dialer/app/res/values/strings.xml')
-rw-r--r-- | java/com/android/dialer/app/res/values/strings.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml index e02c6fb30..5549881c3 100644 --- a/java/com/android/dialer/app/res/values/strings.xml +++ b/java/com/android/dialer/app/res/values/strings.xml @@ -930,4 +930,14 @@ <!-- Label for setting that shows more information about the Phone app [CHAR LIMIT=30] --> <string name="about_phone_label">About</string> + <!-- Button text to prompt a user to open an sms conversation [CHAR LIMIT=NONE] --> + <string name="view_conversation">View</string> + + <!-- If a user deletes a call that has attachments (photo, message, ect) bundled with it, they need + to be told that they need to go to the SMS app to delete the attachments. [CHAR LIMIT=NONE] --> + <string name="ec_data_deleted">Call deleted. View and delete attachments shared during this call in Messages.</string> + + <!-- If a user deletes a call that has attachments (photo, message, ect) bundled with it, they need + to be told that they need to go to the SMS app to delete the attachments. [CHAR LIMIT=NONE] --> + <string name="multiple_ec_data_deleted">Calls deleted. View and delete attachments shared during calls in Messages.</string> </resources> |