Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d641de1 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am a14f25c5: am bf3acff1: Merge "Don\'t run the async query if being rendered... 

am a14f25c5: am bf3acff1: Merge "Don\'t run the async query if being rendered in EditMode." into klp-dev

* commit 'a14f25c5':
  Don't run the async query if being rendered in EditMode.
parents 48f2a25a a14f25c5

core/java/android/widget/QuickContactBadge.java

+7 −5
Original line number Diff line number Diff line
@@ -92,7 +92,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);

    }
@@ -199,7 +201,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);
@@ -239,7 +241,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);
@@ -262,12 +264,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),