diff options
| author | Wenyi Wang <wenyiw@google.com> | 2016-02-08 16:48:09 -0800 |
|---|---|---|
| committer | Wenyi Wang <wenyiw@google.com> | 2016-02-11 21:24:05 +0000 |
| commit | ddaec8dce70613c461d30a2dc100aecbe4888a84 (patch) | |
| tree | 5d16a177321a35eee3474c8b7da1fb830cbe82d4 /res | |
| parent | 9ff6a7caf65540c00e456e4d4a7354f8939ffd0c (diff) | |
| download | android_packages_apps_Contacts-ddaec8dce70613c461d30a2dc100aecbe4888a84.tar.gz android_packages_apps_Contacts-ddaec8dce70613c461d30a2dc100aecbe4888a84.tar.bz2 android_packages_apps_Contacts-ddaec8dce70613c461d30a2dc100aecbe4888a84.zip | |
Add share activity to manifest and move file provider string (AOSP)
Bug 22083005
Change-Id: I9d35cb9eb522d4081fdec11c47b76db467ecc4fd
(cherry picked from commit 734115f22b3a91c4aeee50c54392a218c0aaf019)
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/donottranslate_config.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values/donottranslate_config.xml b/res/values/donottranslate_config.xml index 5fc4f8970..eda94878f 100644 --- a/res/values/donottranslate_config.xml +++ b/res/values/donottranslate_config.xml @@ -42,4 +42,7 @@ <!-- Help URL pointing to editing contacts in People. This is intentionally empty because the overlay will fill this in during build time. --> <string name="help_url_people_edit"></string> + + <!-- File Authority for the photo picker --> + <string name="photo_file_provider_authority">com.android.contacts.files</string> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 31552b64d..8a5f0442f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -805,9 +805,6 @@ <!-- Prefix for messages that you sent [CHAR LIMIT=40] --> <string name="message_from_you_prefix">You: <xliff:g id="sms_body">%s</xliff:g></string> - <!-- File Authority for the photo picker --> - <string name="photo_file_provider_authority" translatable="false">com.android.contacts.files</string> - <!-- When a user tries to create an IM Hangouts field, an alert dialog pops up displaying this message. We don't want users entering email addresses of phone numbers into the IM field. [CHAR LIMIT=200] --> <string name="contact_editor_hangouts_im_alert">Hangouts works better when you enter the person\'s Hangouts identifier into the email field or phone field.</string> |