Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't run the async query if being rendered in EditMode." into klp-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2013-10-21 02:51:19 +00:00
committed by Android (Google) Code Review
parent bab3348fc3 34e9c69658
commit bf3acff10a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/widget/QuickContactBadge.java
View File

@@ -92,7 +92,9 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
com.android.internal.R.styleable.Theme_quickContactBadgeOverlay); com.android.internal.R.styleable.Theme_quickContactBadgeOverlay);
styledAttributes.recycle(); styledAttributes.recycle();
mQueryHandler = new QueryHandler(mContext.getContentResolver()); if (!isInEditMode()) {
mQueryHandler = new QueryHandler(mContext.getContentResolver());
}
setOnClickListener(this); setOnClickListener(this);
} }
@@ -199,7 +201,7 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
public void assignContactFromEmail(String emailAddress, boolean lazyLookup, Bundle extras) { public void assignContactFromEmail(String emailAddress, boolean lazyLookup, Bundle extras) {
mContactEmail = emailAddress; mContactEmail = emailAddress;
mExtras = extras; mExtras = extras;
if (!lazyLookup) { if (!lazyLookup && mQueryHandler != null) {
mQueryHandler.startQuery(TOKEN_EMAIL_LOOKUP, null, mQueryHandler.startQuery(TOKEN_EMAIL_LOOKUP, null,
Uri.withAppendedPath(Email.CONTENT_LOOKUP_URI, Uri.encode(mContactEmail)), Uri.withAppendedPath(Email.CONTENT_LOOKUP_URI, Uri.encode(mContactEmail)),
EMAIL_LOOKUP_PROJECTION, null, null, null); EMAIL_LOOKUP_PROJECTION, null, null, null);
@@ -239,7 +241,7 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
public void assignContactFromPhone(String phoneNumber, boolean lazyLookup, Bundle extras) { public void assignContactFromPhone(String phoneNumber, boolean lazyLookup, Bundle extras) {
mContactPhone = phoneNumber; mContactPhone = phoneNumber;
mExtras = extras; mExtras = extras;
if (!lazyLookup) { if (!lazyLookup && mQueryHandler != null) {
mQueryHandler.startQuery(TOKEN_PHONE_LOOKUP, null, mQueryHandler.startQuery(TOKEN_PHONE_LOOKUP, null,
Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, mContactPhone), Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, mContactPhone),
PHONE_LOOKUP_PROJECTION, null, null, null); PHONE_LOOKUP_PROJECTION, null, null, null);
@@ -262,12 +264,12 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
if (mContactUri != null) { if (mContactUri != null) {
QuickContact.showQuickContact(getContext(), QuickContactBadge.this, mContactUri, QuickContact.showQuickContact(getContext(), QuickContactBadge.this, mContactUri,
QuickContact.MODE_LARGE, mExcludeMimes); QuickContact.MODE_LARGE, mExcludeMimes);
} else if (mContactEmail != null) { } else if (mContactEmail != null && mQueryHandler != null) {
extras.putString(EXTRA_URI_CONTENT, mContactEmail); extras.putString(EXTRA_URI_CONTENT, mContactEmail);
mQueryHandler.startQuery(TOKEN_EMAIL_LOOKUP_AND_TRIGGER, extras, mQueryHandler.startQuery(TOKEN_EMAIL_LOOKUP_AND_TRIGGER, extras,
Uri.withAppendedPath(Email.CONTENT_LOOKUP_URI, Uri.encode(mContactEmail)), Uri.withAppendedPath(Email.CONTENT_LOOKUP_URI, Uri.encode(mContactEmail)),
EMAIL_LOOKUP_PROJECTION, null, null, null); EMAIL_LOOKUP_PROJECTION, null, null, null);
} else if (mContactPhone != null) { } else if (mContactPhone != null && mQueryHandler != null) {
extras.putString(EXTRA_URI_CONTENT, mContactPhone); extras.putString(EXTRA_URI_CONTENT, mContactPhone);
mQueryHandler.startQuery(TOKEN_PHONE_LOOKUP_AND_TRIGGER, extras, mQueryHandler.startQuery(TOKEN_PHONE_LOOKUP_AND_TRIGGER, extras,
Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, mContactPhone), Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, mContactPhone),