am 7d641de1: am a14f25c5: am bf3acff1: Merge "Don\'t run the async query if... (e9293c1a) · Commits · e / os / android_frameworks_base

core/java/android/widget/QuickContactBadge.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -97,7 +97,9 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
		com.android.internal.R.styleable.Theme_quickContactBadgeOverlay);
		styledAttributes.recycle();

		if (!isInEditMode()) {
		mQueryHandler = new QueryHandler(mContext.getContentResolver());
		}
		setOnClickListener(this);
		}

		@@ -204,7 +206,7 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
		public void assignContactFromEmail(String emailAddress, boolean lazyLookup, Bundle extras) {
		mContactEmail = emailAddress;
		mExtras = extras;
		if (!lazyLookup) {
		if (!lazyLookup && mQueryHandler != null) {
		mQueryHandler.startQuery(TOKEN_EMAIL_LOOKUP, null,
		Uri.withAppendedPath(Email.CONTENT_LOOKUP_URI, Uri.encode(mContactEmail)),
		EMAIL_LOOKUP_PROJECTION, null, null, null);
		@@ -244,7 +246,7 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
		public void assignContactFromPhone(String phoneNumber, boolean lazyLookup, Bundle extras) {
		mContactPhone = phoneNumber;
		mExtras = extras;
		if (!lazyLookup) {
		if (!lazyLookup && mQueryHandler != null) {
		mQueryHandler.startQuery(TOKEN_PHONE_LOOKUP, null,
		Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, mContactPhone),
		PHONE_LOOKUP_PROJECTION, null, null, null);
		@@ -267,12 +269,12 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
		if (mContactUri != null) {
		QuickContact.showQuickContact(getContext(), QuickContactBadge.this, mContactUri,
		QuickContact.MODE_LARGE, mExcludeMimes);
		} else if (mContactEmail != null) {
		} else if (mContactEmail != null && mQueryHandler != null) {
		extras.putString(EXTRA_URI_CONTENT, mContactEmail);
		mQueryHandler.startQuery(TOKEN_EMAIL_LOOKUP_AND_TRIGGER, extras,
		Uri.withAppendedPath(Email.CONTENT_LOOKUP_URI, Uri.encode(mContactEmail)),
		EMAIL_LOOKUP_PROJECTION, null, null, null);
		} else if (mContactPhone != null) {
		} else if (mContactPhone != null && mQueryHandler != null) {
		extras.putString(EXTRA_URI_CONTENT, mContactPhone);
		mQueryHandler.startQuery(TOKEN_PHONE_LOOKUP_AND_TRIGGER, extras,
		Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, mContactPhone),