Merge change I517b266a into eclair (8577fee2) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/ContactsListActivity.java

+23 −29

Original line number	Diff line number	Diff line
		@@ -395,14 +395,8 @@ public class ContactsListActivity extends ListActivity implements
		}

		private class DeleteClickListener implements DialogInterface.OnClickListener {
		private Uri mUri;

		public DeleteClickListener(Uri uri) {
		mUri = uri;
		}

		public void onClick(DialogInterface dialog, int which) {
		getContentResolver().delete(mUri, null, null);
		getContentResolver().delete(mSelectedContactUri, null, null);
		}
		}

		@@ -880,7 +874,7 @@ public class ContactsListActivity extends ListActivity implements
		.setMessage(R.string.deleteConfirmation)
		.setNegativeButton(android.R.string.cancel, null)
		.setPositiveButton(android.R.string.ok,
		new DeleteClickListener(mSelectedContactUri)).create();
		new DeleteClickListener()).create();
		}
		case R.id.dialog_readonly_contact_hide_confirmation: {
		return new AlertDialog.Builder(this)
		@@ -889,7 +883,7 @@ public class ContactsListActivity extends ListActivity implements
		.setMessage(R.string.readOnlyContactWarning)
		.setNegativeButton(android.R.string.cancel, null)
		.setPositiveButton(android.R.string.ok,
		new DeleteClickListener(mSelectedContactUri)).create();
		new DeleteClickListener()).create();
		}
		case R.id.dialog_readonly_contact_delete_confirmation: {
		return new AlertDialog.Builder(this)
		@@ -898,7 +892,7 @@ public class ContactsListActivity extends ListActivity implements
		.setMessage(R.string.readOnlyContactDeleteConfirmation)
		.setNegativeButton(android.R.string.cancel, null)
		.setPositiveButton(android.R.string.ok,
		new DeleteClickListener(mSelectedContactUri)).create();
		new DeleteClickListener()).create();
		}
		case R.id.dialog_multiple_contact_delete_confirmation: {
		return new AlertDialog.Builder(this)
		@@ -907,7 +901,7 @@ public class ContactsListActivity extends ListActivity implements
		.setMessage(R.string.multipleContactDeleteConfirmation)
		.setNegativeButton(android.R.string.cancel, null)
		.setPositiveButton(android.R.string.ok,
		new DeleteClickListener(mSelectedContactUri)).create();
		new DeleteClickListener()).create();
		}
		}
		return super.onCreateDialog(id);
		@@ -1152,9 +1146,9 @@ public class ContactsListActivity extends ListActivity implements
		mWritableRawContactIds.clear();

		if (mSelectedContactUri != null) {
		Cursor c = getContentResolver().query(RawContacts.CONTENT_URI,
		RAW_CONTACTS_PROJECTION, RawContacts.CONTACT_ID + "="
		+ ContentUris.parseId(mSelectedContactUri), null, null);
		Cursor c = getContentResolver().query(RawContacts.CONTENT_URI, RAW_CONTACTS_PROJECTION,
		RawContacts.CONTACT_ID + "=" + ContentUris.parseId(mSelectedContactUri), null,
		null);
		Sources sources = Sources.getInstance(ContactsListActivity.this);
		if (c != null) {
		while (c.moveToNext()) {