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

Commit 5c0cbaea authored by Gilles Franck Mevaa's avatar Gilles Franck Mevaa
Browse files

Renaming Dialer elements from Spam to ExtendedBlocking 

Change-Id: I2ad8e07cf6538ed7b5685b2f9695acb09a71e483
parent 04d5d8db

res/layout/call_log_list_item_actions.xml

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
    </LinearLayout>



    <ViewStub

        android:id="@+id/spam_actions_container"

        android:id="@+id/extended_blocking_actions_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>

src/com/android/dialer/calllog/CallLogListItemViewHolder.java

+13 −11
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import com.android.dialer.filterednumber.BlockNumberDialogFragment; 
import com.android.dialer.filterednumber.FilteredNumbersUtil;

import com.android.dialer.logging.Logger;

import com.android.dialer.logging.ScreenEvent;

import com.android.dialer.service.SpamButtonRenderer;

import com.android.dialer.service.ExtendedBlockingButtonRenderer;

import com.android.dialer.util.DialerUtils;

import com.android.dialer.util.PhoneNumberUtil;

import com.android.dialer.voicemail.VoicemailPlaybackLayout;
@@ -205,8 +205,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 


    private final int mPhotoSize;



    private ViewStub mSpamViewStub;

    private SpamButtonRenderer mSpamButtonRenderer;

    private ViewStub mExtendedBlockingViewStub;

    private ExtendedBlockingButtonRenderer mExtendedBlockingButtonRenderer;



    private View.OnClickListener mExpandCollapseListener;

    private boolean mVoicemailPrimaryActionButtonClicked;
@@ -413,8 +413,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
            callWithNoteButtonView = actionsView.findViewById(R.id.call_with_note_action);

            callWithNoteButtonView.setOnClickListener(this);



            mSpamViewStub = (ViewStub) actionsView.findViewById(R.id.spam_actions_container);

            mSpamButtonRenderer = ObjectFactory.newSpamButtonRenderer(mContext, mSpamViewStub);

            mExtendedBlockingViewStub =

                    (ViewStub) actionsView.findViewById(R.id.extended_blocking_actions_container);

            mExtendedBlockingButtonRenderer = ObjectFactory

                    .newExtendedBlockingButtonRenderer(mContext, mExtendedBlockingViewStub);

        }



        bindActionButtons();
@@ -545,7 +547,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
        callWithNoteButtonView.setVisibility(

                supportsCallSubject && !isVoicemailNumber ? View.VISIBLE : View.GONE);



        if(mSpamButtonRenderer != null){

        if(mExtendedBlockingButtonRenderer != null){

            List<View> completeLogListItems = Lists.newArrayList(

                    createNewContactButtonView,

                    addToExistingContactButtonView,
@@ -555,12 +557,12 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
                    detailsButtonView,

                    voicemailPlaybackView);

            List<View> blockedNumberVisibleViews = new ArrayList<>();

            List<View> spamNumberVisibleViews = Lists.newArrayList(detailsButtonView);

            List<View> extendedBlockingVisibleViews = Lists.newArrayList(detailsButtonView);



            mSpamButtonRenderer.setCompleteListItemViews(completeLogListItems);

            mSpamButtonRenderer.setFilteredNumberViews(blockedNumberVisibleViews);

            mSpamButtonRenderer.setSpamFilteredViews(spamNumberVisibleViews);

            mSpamButtonRenderer.render(number, countryIso);

            mExtendedBlockingButtonRenderer.setCompleteListItemViews(completeLogListItems);

            mExtendedBlockingButtonRenderer.setFilteredNumberViews(blockedNumberVisibleViews);

            mExtendedBlockingButtonRenderer.setExtendedFilteredViews(extendedBlockingVisibleViews);

            mExtendedBlockingButtonRenderer.render(number, countryIso);

        }

    }

src/com/android/dialer/service/SpamButtonRenderer.java→src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import java.util.List; 
/**

 * Interface responsible for rendering spam buttons.

 */

public interface SpamButtonRenderer {

public interface ExtendedBlockingButtonRenderer {



    /**

     * Renders buttons for a phone number.
@@ -16,7 +16,7 @@ public interface SpamButtonRenderer { 


    void setCompleteListItemViews(List<View> views);



    void setSpamFilteredViews(List<View> views);

    void setExtendedFilteredViews(List<View> views);



    void setFilteredNumberViews(List<View> views);

src/com/android/dialerbind/ObjectFactory.java

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.dialer.list.RegularSearchFragment; 
import com.android.dialer.logging.Logger;

import com.android.dialer.service.CachedNumberLookupService;

import com.android.dialer.service.ExtendedBlockingManager;

import com.android.dialer.service.SpamButtonRenderer;

import com.android.dialer.service.ExtendedBlockingButtonRenderer;

import com.android.dialer.voicemail.VoicemailPlaybackPresenter;



/**
@@ -46,7 +46,7 @@ public class ObjectFactory { 
    }



    @Nullable

    public static SpamButtonRenderer newSpamButtonRenderer(

    public static ExtendedBlockingButtonRenderer newExtendedBlockingButtonRenderer(

            Context context,

            ViewStub stub) {

        return null;