drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 25829 into eclair

Browse Source 
* changes:
  Revert "ContactsContract: Adding joined columns to the Data class definition."
This commit is contained in:
Android (Google) Code Review
2009-09-18 18:05:50 -04:00
parent a411bf01fc ea36747114
commit b18b0956af
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/provider/ContactsContract.java
View File

@ -682,8 +682,7 @@ public final class ContactsContract {
* definition and some generic columns. Each data type can define the meaning for each of * definition and some generic columns. Each data type can define the meaning for each of
* the generic columns. * the generic columns.
*/ */
public static final class Data implements BaseColumns, DataColumns, RawContactsColumns, public static final class Data implements BaseColumns, DataColumns {
ContactsColumns, SyncColumns {
/** /**
* This utility class cannot be instantiated * This utility class cannot be instantiated
*/ */

4
core/java/android/widget/FasttrackBadgeWidget.java
View File

@ -25,9 +25,9 @@ import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.FastTrack; import android.provider.ContactsContract.FastTrack;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Intents; import android.provider.ContactsContract.Intents;
import android.provider.ContactsContract.PhoneLookup; import android.provider.ContactsContract.PhoneLookup;
import android.provider.ContactsContract.RawContacts;
import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Email;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
@ -55,7 +55,7 @@ public class FasttrackBadgeWidget extends ImageView implements OnClickListener {
static final private int TOKEN_PHONE_LOOKUP_AND_TRIGGER = 3; static final private int TOKEN_PHONE_LOOKUP_AND_TRIGGER = 3;
static final String[] EMAIL_LOOKUP_PROJECTION = new String[] { static final String[] EMAIL_LOOKUP_PROJECTION = new String[] {
Data.CONTACT_ID, RawContacts.CONTACT_ID,
Contacts.LOOKUP_KEY, Contacts.LOOKUP_KEY,
}; };
static int EMAIL_ID_COLUMN_INDEX = 0; static int EMAIL_ID_COLUMN_INDEX = 0;