diff options
| author | Walter Jang <wjang@google.com> | 2016-11-07 09:24:43 -0800 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@lineageos.org> | 2017-02-03 23:15:43 +0000 |
| commit | f2ee7f03f49ee28823a1665d9ee111b05214c7e4 (patch) | |
| tree | 2b22b87394abf6fb7021e0447e49554ac572cb25 /res | |
| parent | 086f5bc849d2406d3686fe8f006c0247bb8b96dd (diff) | |
| download | android_packages_apps_ContactsCommon-f2ee7f03f49ee28823a1665d9ee111b05214c7e4.tar.gz android_packages_apps_ContactsCommon-f2ee7f03f49ee28823a1665d9ee111b05214c7e4.tar.bz2 android_packages_apps_ContactsCommon-f2ee7f03f49ee28823a1665d9ee111b05214c7e4.zip | |
resolve merge conflicts of 9f523b4 to nyc-dev
Bug: 32219099
Merged-In: Ib141ad682488aeabf6d90e8d169d5fff6df7a8dd
Change-Id: I895b1f9f8ade2dcfa47d1c17e0aaac2edeb75a74
(cherry picked from commit b7eecdd9a1276b721bb9644a0762dfd969e52709)
(cherry picked from commit d47661ad82d402c1e0c90eb83970687d784add1b)
# Conflicts:
# src/com/android/contacts/common/activity/RequestPermissionsActivity.java
# src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
# src/com/android/contacts/common/util/AccountSelectionUtil.java
# src/com/android/contacts/common/vcard/ImportVCardActivity.java
mh0rst: Backport from android-7.1.1_r9
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index fab8e973..95199fe0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -431,6 +431,9 @@ a ren't members of any other group. [CHAR LIMIT=25] --> <!-- Action string for selecting a .vcf file to import contacts from [CHAR LIMIT=30] --> <string name="import_from_vcf_file" product="default">Import from .vcf file</string> + <!-- Dialog message asking the user for confirmation before starting to import contacts from a .vcf file. [CHAR LIMIT=NONE] --> + <string name="import_from_vcf_file_confirmation_message" product="default">Import contacts from vCard?</string> + <!-- Message shown in a Dialog confirming a user's cancel request toward existing vCard import. The argument is file name for the vCard import the user wants to cancel. [CHAR LIMIT=128] --> |