commit 39466593586d2d15fc2e9fa8f0d1cd39d35ea3d9
author Dmitri Plotnikov <dplotnikov@google.com> Mon Jul 27 11:23:51 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Jul 27 11:23:51 2009 -0700
tree 8a55bddd9de3fa8d59e5c5b38b845a522bcfcd42
parent 104b792caf7a107f99e0de2470be652f0c10d1a8

Renaming Contacts to RawContacts

src/com/android/contacts/ShowOrCreateActivity.java

diff --git a/src/com/android/contacts/ShowOrCreateActivity.java b/src/com/android/contacts/ShowOrCreateActivity.java
index 288c289..365353e 100755
--- a/src/com/android/contacts/ShowOrCreateActivity.java
+++ b/src/com/android/contacts/ShowOrCreateActivity.java
@@ -32,7 +32,7 @@
 import android.os.IBinder;
 import android.provider.Contacts.Intents;
 import android.provider.ContactsContract.Aggregates;
-import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.RawContacts;
 import android.provider.ContactsContract.PhoneLookup;
 import android.view.View;
 
@@ -62,7 +62,7 @@
     };
 
     static final String[] CONTACTS_PROJECTION = new String[] {
-        Contacts.AGGREGATE_ID,
+        RawContacts.AGGREGATE_ID,
     };
 
     static final String SCHEME_MAILTO = "mailto";
@@ -130,7 +130,7 @@
         if (SCHEME_MAILTO.equals(scheme)) {
             mCreateExtras.putString(Intents.Insert.EMAIL, ssp);
 
-            Uri uri = Uri.withAppendedPath(Contacts.CONTENT_FILTER_EMAIL_URI, Uri.encode(ssp));
+            Uri uri = Uri.withAppendedPath(RawContacts.CONTENT_FILTER_EMAIL_URI, Uri.encode(ssp));
             mQueryHandler.startQuery(QUERY_TOKEN, null, uri, CONTACTS_PROJECTION, null, null, null);
 
         } else if (SCHEME_TEL.equals(scheme)) {
@@ -218,9 +218,9 @@
             // No matching contacts found
             if (mCreateForce) {
                 // Forced to create new contact
-                Intent createIntent = new Intent(Intent.ACTION_INSERT, Contacts.CONTENT_URI);
+                Intent createIntent = new Intent(Intent.ACTION_INSERT, RawContacts.CONTENT_URI);
                 createIntent.putExtras(mCreateExtras);
-                createIntent.setType(Contacts.CONTENT_TYPE);
+                createIntent.setType(RawContacts.CONTENT_TYPE);
 
                 startActivity(createIntent);
                 finish();
@@ -229,7 +229,7 @@
                 // Prompt user to insert or edit contact
                 Intent createIntent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
                 createIntent.putExtras(mCreateExtras);
-                createIntent.setType(Contacts.CONTENT_ITEM_TYPE);
+                createIntent.setType(RawContacts.CONTENT_ITEM_TYPE);
 
                 CharSequence message = getResources().getString(
                         R.string.add_contact_dlg_message_fmt, mCreateDescrip);