From b14d3667bff16d118e8cff927b56ccd5295b7b27 Mon Sep 17 00:00:00 2001 From: Gilles Franck Mevaa Date: Thu, 4 Feb 2016 14:23:14 -0800 Subject: Renaming Dialer elements from Spam to ExtendedBlocking Change-Id: I2ad8e07cf6538ed7b5685b2f9695acb09a71e483 (cherry picked from commit 5c0cbaeaadf976a821128a99462beda4ac6955d7) --- .../dialer/calllog/CallLogListItemViewHolder.java | 24 ++++++++++++---------- .../service/ExtendedBlockingButtonRenderer.java | 23 +++++++++++++++++++++ .../android/dialer/service/SpamButtonRenderer.java | 23 --------------------- src/com/android/dialerbind/ObjectFactory.java | 4 ++-- 4 files changed, 38 insertions(+), 36 deletions(-) create mode 100644 src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java delete mode 100644 src/com/android/dialer/service/SpamButtonRenderer.java (limited to 'src') diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java index f76312db1..e60dd2728 100644 --- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java +++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java @@ -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 completeLogListItems = Lists.newArrayList( createNewContactButtonView, addToExistingContactButtonView, @@ -555,12 +557,12 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder detailsButtonView, voicemailPlaybackView); List blockedNumberVisibleViews = new ArrayList<>(); - List spamNumberVisibleViews = Lists.newArrayList(detailsButtonView); + List 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); } } diff --git a/src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java b/src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java new file mode 100644 index 000000000..9ce844776 --- /dev/null +++ b/src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java @@ -0,0 +1,23 @@ +package com.android.dialer.service; + +import android.view.View; + +import java.util.List; + +/** + * Interface responsible for rendering spam buttons. + */ +public interface ExtendedBlockingButtonRenderer { + + /** + * Renders buttons for a phone number. + */ + void render(String number, String countryIso); + + void setCompleteListItemViews(List views); + + void setExtendedFilteredViews(List views); + + void setFilteredNumberViews(List views); + +} diff --git a/src/com/android/dialer/service/SpamButtonRenderer.java b/src/com/android/dialer/service/SpamButtonRenderer.java deleted file mode 100644 index 843bc55d5..000000000 --- a/src/com/android/dialer/service/SpamButtonRenderer.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.android.dialer.service; - -import android.view.View; - -import java.util.List; - -/** - * Interface responsible for rendering spam buttons. - */ -public interface SpamButtonRenderer { - - /** - * Renders buttons for a phone number. - */ - void render(String number, String countryIso); - - void setCompleteListItemViews(List views); - - void setSpamFilteredViews(List views); - - void setFilteredNumberViews(List views); - -} diff --git a/src/com/android/dialerbind/ObjectFactory.java b/src/com/android/dialerbind/ObjectFactory.java index 299d736f3..51b8fbc44 100644 --- a/src/com/android/dialerbind/ObjectFactory.java +++ b/src/com/android/dialerbind/ObjectFactory.java @@ -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; -- cgit v1.2.3