Renaming Contacts to RawContacts
diff --git a/src/com/android/contacts/ContactEntryAdapter.java b/src/com/android/contacts/ContactEntryAdapter.java
index 3b28b19..d384f83 100644
--- a/src/com/android/contacts/ContactEntryAdapter.java
+++ b/src/com/android/contacts/ContactEntryAdapter.java
@@ -20,7 +20,6 @@
import android.net.Uri;
import android.os.Parcel;
import android.provider.ContactsContract.Aggregates;
-import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/src/com/android/contacts/FastTrackWindow.java b/src/com/android/contacts/FastTrackWindow.java
index 0413110..f206dd1 100644
--- a/src/com/android/contacts/FastTrackWindow.java
+++ b/src/com/android/contacts/FastTrackWindow.java
@@ -37,7 +37,6 @@
import android.provider.Contacts.Phones;
import android.provider.ContactsContract.Aggregates;
import android.provider.ContactsContract.CommonDataKinds;
-import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Presence;
import android.provider.ContactsContract.CommonDataKinds.Email;
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);
diff --git a/src/com/android/contacts/SocialStreamActivity.java b/src/com/android/contacts/SocialStreamActivity.java
index 679424d..65c9932 100644
--- a/src/com/android/contacts/SocialStreamActivity.java
+++ b/src/com/android/contacts/SocialStreamActivity.java
@@ -43,8 +43,8 @@
import android.provider.ContactsContract;
import android.provider.ContactsContract.Aggregates;
import android.provider.ContactsContract.CommonDataKinds;
-import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.RawContacts;
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.SocialContract.Activities;
import android.text.SpannableStringBuilder;
@@ -61,14 +61,12 @@
import android.view.View.OnClickListener;
import android.widget.CursorAdapter;
import android.widget.ImageView;
-import android.widget.ListAdapter;
import android.widget.ListView;
+import android.widget.RemoteViews;
import android.widget.TextView;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.List;
public class SocialStreamActivity extends ListActivity implements OnClickListener, EdgeTriggerListener {
@@ -79,7 +77,7 @@
Activities.RES_PACKAGE,
Activities.MIMETYPE,
Activities.AUTHOR_CONTACT_ID,
- Contacts.AGGREGATE_ID,
+ RawContacts.AGGREGATE_ID,
Aggregates.DISPLAY_NAME,
Activities.PUBLISHED,
Activities.TITLE,
@@ -359,7 +357,7 @@
}
/**
- * Keep a cache that maps from {@link Contacts#_ID} to {@link Photo#PHOTO}
+ * Keep a cache that maps from {@link RawContacts#_ID} to {@link Photo#PHOTO}
* values.
*/
private static class ContactsCache {
diff --git a/src/com/android/contacts/SplitAggregateView.java b/src/com/android/contacts/SplitAggregateView.java
index ef6b4f4..15b50d3 100644
--- a/src/com/android/contacts/SplitAggregateView.java
+++ b/src/com/android/contacts/SplitAggregateView.java
@@ -22,7 +22,6 @@
import android.database.Cursor;
import android.graphics.Bitmap;
import android.net.Uri;
-import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Aggregates.Data;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Nickname;
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 35710b5..8c29d49 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -16,9 +16,9 @@
package com.android.contacts;
+import static com.android.contacts.ContactEntryAdapter.AGGREGATE_PHOTO_ID;
import static com.android.contacts.ContactEntryAdapter.AGGREGATE_PROJECTION;
import static com.android.contacts.ContactEntryAdapter.AGGREGATE_STARRED_COLUMN;
-import static com.android.contacts.ContactEntryAdapter.AGGREGATE_PHOTO_ID;
import static com.android.contacts.ContactEntryAdapter.DATA_1_COLUMN;
import static com.android.contacts.ContactEntryAdapter.DATA_2_COLUMN;
import static com.android.contacts.ContactEntryAdapter.DATA_3_COLUMN;
@@ -58,12 +58,12 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
-import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Aggregates;
import android.provider.ContactsContract.AggregationExceptions;
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Presence;
+import android.provider.ContactsContract.RawContacts;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
@@ -84,9 +84,6 @@
import android.widget.Toast;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
/**
* Displays the details of a specific contact.
@@ -568,8 +565,8 @@
}
private void joinAggregate(final long aggregateId) {
- Cursor c = mResolver.query(Contacts.CONTENT_URI, new String[] {Contacts._ID},
- Contacts.AGGREGATE_ID + "=" + aggregateId, null, null);
+ Cursor c = mResolver.query(RawContacts.CONTENT_URI, new String[] {RawContacts._ID},
+ RawContacts.AGGREGATE_ID + "=" + aggregateId, null, null);
try {
while(c.moveToNext()) {