LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 740c3e2e: merge from open-source master

Browse Source 
Merge commit '740c3e2e97a4cca24ecb534de72663ced238156a' into kraken

* commit '740c3e2e97a4cca24ecb534de72663ced238156a':
  Updated deprecated Contacts API to ContactsContract
This commit is contained in:
The Android Open Source Project
2010-06-02 07:27:39 -07:00
committed by Android Git Automerger
parent 85c4a21b9e 740c3e2e97
commit 74a0b22062
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/ApiDemos/src/com/example/android/apis/app/AlertDialogSamples.java
View File

@@ -30,7 +30,7 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.Toast;
import android.database.Cursor;
import android.provider.Contacts;
import android.provider.ContactsContract;
import com.example.android.apis.R;
@@ -186,13 +186,15 @@ public class AlertDialogSamples extends Activity {
/* User clicked on a check box do some stuff */
}
})
.setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
.setPositiveButton(R.string.alert_dialog_ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
/* User clicked Yes so do some stuff */
}
})
.setNegativeButton(R.string.alert_dialog_cancel, new DialogInterface.OnClickListener() {
.setNegativeButton(R.string.alert_dialog_cancel,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
/* User clicked No so do some stuff */
@@ -201,17 +203,18 @@ public class AlertDialogSamples extends Activity {
.create();
case DIALOG_MULTIPLE_CHOICE_CURSOR:
String[] projection = new String[] {
Contacts.People._ID,
Contacts.People.NAME,
Contacts.People.SEND_TO_VOICEMAIL
ContactsContract.Contacts._ID,
ContactsContract.Contacts.DISPLAY_NAME,
ContactsContract.Contacts.SEND_TO_VOICEMAIL
};
Cursor cursor = managedQuery(Contacts.People.CONTENT_URI, projection, null, null, null);
Cursor cursor = managedQuery(ContactsContract.Contacts.CONTENT_URI,
projection, null, null, null);
return new AlertDialog.Builder(AlertDialogSamples.this)
.setIcon(R.drawable.ic_popup_reminder)
.setTitle(R.string.alert_dialog_multi_choice_cursor)
.setMultiChoiceItems(cursor,
Contacts.People.SEND_TO_VOICEMAIL,
Contacts.People.NAME,
ContactsContract.Contacts.SEND_TO_VOICEMAIL,
ContactsContract.Contacts.DISPLAY_NAME,
new DialogInterface.OnMultiChoiceClickListener() {
public void onClick(DialogInterface dialog, int whichButton,
boolean isChecked) {

7
samples/ApiDemos/src/com/example/android/apis/app/ContactsSelectInstrumentation.java
View File

@@ -20,14 +20,11 @@ import android.app.Activity;
import android.app.Instrumentation;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.IBinder;
import android.view.KeyEvent;
import android.provider.Contacts;
import android.provider.ContactsContract;
import android.os.Bundle;
import android.util.Log;
import java.util.Map;
/**
* This is an example implementation of the {@link android.app.Instrumentation}
* class, allowing you to run tests against application code. The
@@ -61,7 +58,7 @@ public class ContactsSelectInstrumentation extends Instrumentation {
// Monitor for the expected start activity call.
ActivityMonitor am = addMonitor(IntentFilter.create(
Intent.ACTION_VIEW, Contacts.People.CONTENT_ITEM_TYPE), null, true);
Intent.ACTION_VIEW, ContactsContract.Contacts.CONTENT_ITEM_TYPE), null, true);
// We are going to enqueue a couple key events to simulate the user
// selecting an item in the list.