diff options
author | Gilles Franck Mevaa <gillesd@google.com> | 2016-02-04 14:23:14 -0800 |
---|---|---|
committer | Gilles Franck Mevaa <gillesd@google.com> | 2016-02-06 13:46:54 -0800 |
commit | 5c0cbaeaadf976a821128a99462beda4ac6955d7 (patch) | |
tree | 568c01c64dcbf5a365998a34eaad9d6c35cdaf65 /src | |
parent | 04d5d8db47202b959b84c50f2f47c4c7f56359ea (diff) |
Renaming Dialer elements from Spam to ExtendedBlocking
Change-Id: I2ad8e07cf6538ed7b5685b2f9695acb09a71e483
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogListItemViewHolder.java | 24 | ||||
-rw-r--r-- | src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java (renamed from src/com/android/dialer/service/SpamButtonRenderer.java) | 4 | ||||
-rw-r--r-- | src/com/android/dialerbind/ObjectFactory.java | 4 |
3 files changed, 17 insertions, 15 deletions
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<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); } } diff --git a/src/com/android/dialer/service/SpamButtonRenderer.java b/src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java index 843bc55d5..9ce844776 100644 --- a/src/com/android/dialer/service/SpamButtonRenderer.java +++ b/src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java @@ -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); 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; |