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

am 6a154178: Merge change 25800 into eclair

Browse Source 
Merge commit '6a15417849afab889f1f0cd79e655eaac6b45dca' into eclair-plus-aosp

* commit '6a15417849afab889f1f0cd79e655eaac6b45dca':
  ContactsContract: Adding joined columns to the Data class definition.
This commit is contained in:
Dmitri Plotnikov
2009-09-18 14:00:03 -07:00
committed by Android Git Automerger
parent d1cbfe0a53 6a15417849
commit ad47951354
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -682,7 +682,8 @@ 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 { public static final class Data implements BaseColumns, DataColumns, RawContactsColumns,
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[] {
RawContacts.CONTACT_ID, Data.CONTACT_ID,
Contacts.LOOKUP_KEY, Contacts.LOOKUP_KEY,
}; };
static int EMAIL_ID_COLUMN_INDEX = 0; static int EMAIL_ID_COLUMN_INDEX = 0;