Fix merge fail (fb7c4d79) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/ContactsListActivity.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import com.android.contacts.ui.ContactsPreferencesActivity;
		import com.android.contacts.ui.ContactsPreferencesActivity.Prefs;
		import com.android.contacts.util.AccountSelectionUtil;
		import com.android.contacts.util.Constants;
		import com.android.contacts.PhoneDisambigDialog;

		import android.accounts.Account;
		import android.accounts.AccountManager;

src/com/android/contacts/ContactsUtils.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -495,7 +495,7 @@ public class ContactsUtils {
		* Calls the specified contact ID, displaying a number picker if necessary.
		* @return true if the call was initiated, false otherwise
		*/
		public static boolean callOrSmsContact(long contactId, Context context, boolean sendSms) {
		public static boolean callOrSmsContact(long contactId, Context context, boolean sendSms, int stickyTab) {
		String phone = null;
		Cursor phonesCursor = null;
		phonesCursor = queryPhoneNumbers(context.getContentResolver(), contactId);
		@@ -521,12 +521,13 @@ public class ContactsUtils {
		if (phone == null) {
		// Display dialog to choose a number to call.
		PhoneDisambigDialog phoneDialog = new PhoneDisambigDialog(
		context, phonesCursor, sendSms);
		context, phonesCursor, sendSms, stickyTab);
		phoneDialog.show();
		} else {
		if (sendSms) {
		ContactsUtils.initiateSms(context, phone);
		} else {
		StickyTabs.saveTab(context, stickyTab);
		ContactsUtils.initiateCall(context, phone);
		}
		}

src/com/android/contacts/RecentCallsListActivity.java

+15 −12

Original line number	Diff line number	Diff line
		@@ -189,12 +189,9 @@ public class RecentCallsListActivity extends ListActivity
		private static boolean isQuickContact;
		private static boolean showDialButton;

		<<<<<<< HEAD
		private boolean mScrollToTop;
		=======
		private static final String INSERT_BLACKLIST = "com.android.phone.INSERT_BLACKLIST";

		>>>>>>> add ability to send number to phone for blacklist
		private ContactPhotoLoader mPhotoLoader;

		static final class ContactInfo {
		@@ -512,7 +509,6 @@ public class RecentCallsListActivity extends ListActivity
		info.photoId = dataTableCursor.getLong(dataTableCursor.getColumnIndex(Data.PHOTO_ID));
		info.lookupKey = dataTableCursor.getString(dataTableCursor.getColumnIndex(Data.LOOKUP_KEY));


		infoUpdated = true;
		}
		dataTableCursor.close();
		@@ -538,6 +534,10 @@ public class RecentCallsListActivity extends ListActivity
		info.photoId = phonesCursor.getLong(PHOTO_ID_COLUMN_INDEX);
		info.lookupKey = phonesCursor.getString(LOOKUP_KEY_COLUMN_INDEX);

		//Wysie: Contact pictures
		info.photoId = phonesCursor.getLong(PHOTO_ID_COLUMN_INDEX);
		info.lookupKey = phonesCursor.getString(LOOKUP_KEY_COLUMN_INDEX);

		infoUpdated = true;
		}
		phonesCursor.close();
		@@ -1381,8 +1381,9 @@ public class RecentCallsListActivity extends ListActivity
		}

		Cursor cursor = (Cursor)mAdapter.getItem(menuInfo.position);

		switch (item.getItemId()) {
		case MENU_ITEM_DELETE: {
		case CONTEXT_MENU_ITEM_DELETE: {
		int groupSize = 1;
		if (mAdapter.isGroupHeader(menuInfo.position)) {
		groupSize = mAdapter.getGroupSize(menuInfo.position);
		@@ -1400,17 +1401,19 @@ public class RecentCallsListActivity extends ListActivity

		getContentResolver().delete(Calls.CONTENT_URI, Calls._ID + " IN (" + sb + ")",
		null);
		}break;
		case CONTEXT_MENU_CALL_CONTACT: {
		StickyTabs.saveTab(this, getIntent());
		startActivity(item.getIntent());
		return true;
		}
		break;
		case MENU_ITEM_BLACKLIST: {
		Intent intent = new Intent(INSERT_BLACKLIST);
		intent.putExtra("Insert.BLACKLIST", cursor.getString(NUMBER_COLUMN_INDEX));
		sendBroadcast(intent);
		}break;
		}
		break;
		case CONTEXT_MENU_CALL_CONTACT: {
		StickyTabs.saveTab(this, getIntent());
		startActivity(item.getIntent());
		return true;
		}
		}
		return super.onContextItemSelected(item);
		}

src/com/android/contacts/ViewContactActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -824,7 +824,7 @@ public class ViewContactActivity extends Activity
		// There isn't anything selected; pick the correct number to dial.
		long freshContactId = getRefreshedContactId();

		if(!ContactsUtils.callOrSmsContact(freshContactId, this, false)) {
		if(!ContactsUtils.callOrSmsContact(freshContactId, this, false, StickyTabs.getTab(getIntent()))) {
		signalError();
		return false;
		}