Merge "Avoid using prioritized mimetype on pre-M SDKs" into ub-contactsdialer-b-dev (b8ca208e) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/CallDetailActivity.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import com.android.contacts.common.ClipboardUtils;
		import com.android.contacts.common.ContactPhotoManager;
		import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
		import com.android.contacts.common.GeoUtil;
		import com.android.contacts.common.compat.CompatUtils;
		import com.android.contacts.common.interactions.TouchPointManager;
		import com.android.contacts.common.preference.ContactsPreferences;
		import com.android.contacts.common.testing.NeededForTesting;
		@@ -249,7 +250,9 @@ public class CallDetailActivity extends AppCompatActivity

		mQuickContactBadge = (QuickContactBadge) findViewById(R.id.quick_contact_photo);
		mQuickContactBadge.setOverlay(null);
		if (CompatUtils.hasPrioritizedMimeType()) {
		mQuickContactBadge.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);
		}
		mCallerName = (TextView) findViewById(R.id.caller_name);
		mCallerNumber = (TextView) findViewById(R.id.caller_number);
		mAccountLabel = (TextView) findViewById(R.id.phone_account_label);

+4 −2

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import com.android.contacts.common.CallUtil;
		import com.android.contacts.common.ClipboardUtils;
		import com.android.contacts.common.ContactPhotoManager;
		import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
		import com.android.contacts.common.compat.CompatUtils;
		import com.android.contacts.common.dialog.CallSubjectDialog;
		import com.android.contacts.common.testing.NeededForTesting;
		import com.android.contacts.common.util.UriUtils;
		@@ -240,8 +241,9 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		phoneCallDetailsViews.callLocationAndDate.setElegantTextHeight(false);

		quickContactView.setOverlay(null);
		if (CompatUtils.hasPrioritizedMimeType()) {
		quickContactView.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);

		}
		primaryActionButtonView.setOnClickListener(this);
		primaryActionView.setOnClickListener(mExpandCollapseListener);
		primaryActionView.setOnCreateContextMenuListener(this);

+5 −3

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.app.FragmentManager;
		import android.content.Context;
		import android.content.res.Resources;
		import android.provider.ContactsContract;
		import android.provider.ContactsContract.CommonDataKinds.Phone;
		import android.text.BidiFormatter;
		import android.text.TextDirectionHeuristics;
		import android.text.TextUtils;
		@@ -30,6 +31,7 @@ import android.widget.TextView;

		import com.android.contacts.common.ContactPhotoManager;
		import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
		import com.android.contacts.common.compat.CompatUtils;
		import com.android.contacts.common.util.UriUtils;
		import com.android.dialer.R;
		import com.android.dialer.calllog.ContactInfo;
		@@ -63,9 +65,9 @@ public class NumbersAdapter extends SimpleCursorAdapter {
		final QuickContactBadge quickContactBadge =
		(QuickContactBadge) view.findViewById(R.id.quick_contact_photo);
		quickContactBadge.setOverlay(null);
		quickContactBadge.setPrioritizedMimeType(
		ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);

		if (CompatUtils.hasPrioritizedMimeType()) {
		quickContactBadge.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);
		}
		final ContactInfo info = mContactInfoHelper.lookupNumber(number, countryIso);
		final CharSequence locationOrType = getNumberTypeOrLocation(info);
		final String displayNumber = getDisplayNumber(info);

+8 −2

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.view.View;
		import android.view.ViewGroup;
		import android.widget.AdapterView;

		import com.android.contacts.common.compat.CompatUtils;
		import com.android.contacts.common.list.ContactEntryListAdapter;
		import com.android.contacts.common.list.ContactEntryListFragment;
		import com.android.contacts.common.list.ContactListFilter;
		@@ -152,8 +153,13 @@ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryLi
		public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
		final Uri uri = (Uri) view.getTag();
		if (uri != null) {
		if (CompatUtils.hasPrioritizedMimeType()) {
		QuickContact.showQuickContact(getContext(), view, uri, null,
		Phone.CONTENT_ITEM_TYPE);
		} else {
		QuickContact.showQuickContact(getActivity(), view, uri, QuickContact.MODE_LARGE,
		null);
		}
		}
		}

+8 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.view.View;
		import android.widget.ImageButton;
		import android.widget.TextView;

		import com.android.contacts.common.compat.CompatUtils;
		import com.android.contacts.common.list.ContactEntry;
		import com.android.dialer.R;

		@@ -63,8 +64,13 @@ public class PhoneFavoriteSquareTileView extends PhoneFavoriteTileView {
		}

		private void launchQuickContact() {
		if (CompatUtils.hasPrioritizedMimeType()) {
		QuickContact.showQuickContact(getContext(), PhoneFavoriteSquareTileView.this,
		getLookupUri(), null, Phone.CONTENT_ITEM_TYPE);
		} else {
		QuickContact.showQuickContact(getContext(), PhoneFavoriteSquareTileView.this,
		getLookupUri(), QuickContact.MODE_LARGE, null);
		}
		}

		@Override