diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-09 11:52:14 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-09 11:52:14 -0700 |
| commit | 7d2e8218a56ab5403bfbd83821fef13dd8f2fc22 (patch) | |
| tree | cb56c337a96dfd37c3f209898c22ec82b18e3c8d | |
| parent | 843921b7cde004adab16b8949788d20901006f62 (diff) | |
| download | ContactsProvider-7d2e8218a56ab5403bfbd83821fef13dd8f2fc22.tar.gz | |
auto import from //branches/cupcake/...@137197
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 14 | ||||
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider.java | 2 |
3 files changed, 16 insertions, 2 deletions
@@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user development +LOCAL_MODULE_TAGS := user LOCAL_SRC_FILES := $(call all-subdir-java-files) diff --git a/res/values/strings.xml b/res/values/strings.xml index 799a73c3..fd47dc2b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -23,4 +23,18 @@ <string name="dialNumber">Dial number</string> <string name="createNewContact">New contact</string> <string name="usingNumber">Using <xliff:g id="number">%s</xliff:g></string> + + <!-- The first line of "Dial number using NNN", + which appears if you type a number into contacts search. --> + <string name="dial_number">Dial number</string> + <!-- The second line of "Dial number using NNN", + which appears if you type a number into contacts search. --> + <string name="dial_number_using">using <xliff:g id="number" example="555">%s</xliff:g></string> + + <!-- The first line of "Create contact using NNN", + which appears if you type a number into contacts search. --> + <string name="create_contact">Create contact</string> + <!-- The second line of "Create contact using NNN", + which appears if you type a number into contacts search. --> + <string name="create_contact_using">using <xliff:g id="number" example="555">%s</xliff:g></string> </resources> diff --git a/src/com/android/providers/contacts/ContactsProvider.java b/src/com/android/providers/contacts/ContactsProvider.java index 9f6584ec..23e9cf3c 100644 --- a/src/com/android/providers/contacts/ContactsProvider.java +++ b/src/com/android/providers/contacts/ContactsProvider.java @@ -4055,7 +4055,7 @@ public class ContactsProvider extends AbstractSyncableContentProvider { map.put(ContactMethods.LABEL, ContactMethods.LABEL); map.put(ContactMethods.DATA, ContactMethods.DATA); map.put(ContactMethods.AUX_DATA, ContactMethods.AUX_DATA); - map.put(ContactMethods.PERSON_ID, ContactMethods.PERSON_ID); + map.put(ContactMethods.PERSON_ID, "contact_methods.person AS " + ContactMethods.PERSON_ID); map.put(ContactMethods.ISPRIMARY, ContactMethods.ISPRIMARY); map.putAll(peopleColumns); sContactMethodsProjectionMap = map; |