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

Commit ea127e8a authored by Gary Mai's avatar Gary Mai Committed by Android (Google) Code Review
Browse files

Merge "Disable duplicates suggestions card in QuickContact"

parents 023f61b8 d1d8a7a2

src/com/android/contacts/quickcontact/QuickContactActivity.java

+61 −50
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.content.Loader; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.res.ColorStateList;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;
@@ -264,9 +263,10 @@ public class QuickContactActivity extends ContactsActivity 
    private ExpandingEntryCardView mPermissionExplanationCard;



    // Suggestion card.

    private boolean mShouldShowSuggestions = false;

    private CardView mCollapsedSuggestionCardView;

    private CardView mExpandSuggestionCardView;

    private View mCollapasedSuggestionHeader;

    private View mCollapsedSuggestionHeader;

    private TextView mCollapsedSuggestionCardTitle;

    private TextView mExpandSuggestionCardTitle;

    private ImageView mSuggestionSummaryPhoto;
@@ -491,6 +491,9 @@ public class QuickContactActivity extends ContactsActivity 


    @Override

    public void onAggregationSuggestionChange() {

        if (!mShouldShowSuggestions) {

            return;

        }

        if (mAggregationSuggestionEngine == null) {

            return;

        }
@@ -1005,15 +1008,17 @@ public class QuickContactActivity extends ContactsActivity 
        mPermissionExplanationCard =

                (ExpandingEntryCardView) findViewById(R.id.permission_explanation_card);



        if (mShouldShowSuggestions) {

            mCollapsedSuggestionCardView = (CardView) findViewById(R.id.collapsed_suggestion_card);

            mExpandSuggestionCardView = (CardView) findViewById(R.id.expand_suggestion_card);

        mCollapasedSuggestionHeader = findViewById(R.id.collapsed_suggestion_header);

            mCollapsedSuggestionHeader = findViewById(R.id.collapsed_suggestion_header);

            mCollapsedSuggestionCardTitle = (TextView) findViewById(

                    R.id.collapsed_suggestion_card_title);

            mExpandSuggestionCardTitle = (TextView) findViewById(R.id.expand_suggestion_card_title);

            mSuggestionSummaryPhoto = (ImageView) findViewById(R.id.suggestion_icon);

            mSuggestionForName = (TextView) findViewById(R.id.suggestion_for_name);

        mSuggestionContactsNumber = (TextView) findViewById(R.id.suggestion_for_contacts_number);

            mSuggestionContactsNumber = (TextView) findViewById(

                    R.id.suggestion_for_contacts_number);

            mSuggestionList = (LinearLayout) findViewById(R.id.suggestion_list);

            mSuggestionsCancelButton = (Button) findViewById(R.id.cancel_button);

            mSuggestionsLinkButton = (Button) findViewById(R.id.link_button);
@@ -1034,7 +1039,7 @@ public class QuickContactActivity extends ContactsActivity 
            } else {

                enableLinkButton();

            }

        mCollapasedSuggestionHeader.setOnClickListener(new OnClickListener() {

            mCollapsedSuggestionHeader.setOnClickListener(new OnClickListener() {

                @Override

                public void onClick(View view) {

                    mCollapsedSuggestionCardView.setVisibility(View.GONE);
@@ -1054,6 +1059,7 @@ public class QuickContactActivity extends ContactsActivity 
                    mIsSuggestionListCollapsed = true;

                }

            });

        }



        mPermissionExplanationCard.setOnClickListener(mEntryClickHandler);

        mNoContactDetailsCard.setOnClickListener(mEntryClickHandler);
@@ -1460,6 +1466,9 @@ public class QuickContactActivity extends ContactsActivity 
    }



    private void populateSuggestionCard() {

        if (!mShouldShowSuggestions) {

            return;

        }

        // Initialize suggestion related view and data.

        if (mPreviousContactId != mContactData.getId()) {

            mCollapsedSuggestionCardView.setVisibility(View.GONE);
@@ -2406,8 +2415,10 @@ public class QuickContactActivity extends ContactsActivity 
        mContactCard.setColorAndFilter(mColorFilterColor, mColorFilter);

        mRecentCard.setColorAndFilter(mColorFilterColor, mColorFilter);

        mAboutCard.setColorAndFilter(mColorFilterColor, mColorFilter);

        if (mShouldShowSuggestions) {

            mSuggestionsCancelButton.setTextColor(mColorFilterColor);

        }

    }



    private void updateStatusBarColor() {

        if (mScroller == null || !CompatUtils.isLollipopCompatible()) {