From c6ed16091cf15c3546d3bd1188e14b8aef935280 Mon Sep 17 00:00:00 2001 From: Brandon Maxwell Date: Sun, 6 Mar 2016 13:52:20 -0800 Subject: Adding block numbers migration dialog + When the user attempts to block a number and they haven't migrated to the framework blocking implementation, they should be shown a dialog that asks them to migrate. This CL introduces the Dialog that is shown and updates the Call log and Call details to open it. + As part one of the change, the Dialog is shown every time the user attempts to block or unblock a number (when the feature is enabled). A later CL will complete this migration step to ensure that the dialog is only shown until migration is finished. Bug: 26664600 Change-Id: Ia4c2d504f8d98679b90d232058eb5ee6ea9b38f1 --- .../android/dialer/calllog/CallLogListItemViewHolder.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/com/android/dialer/calllog') diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java index 392672fec..de9bf7739 100644 --- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java +++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java @@ -51,9 +51,11 @@ import com.android.contacts.common.util.UriUtils; import com.android.dialer.DialtactsActivity; import com.android.dialer.R; import com.android.dialer.calllog.calllogcache.CallLogCache; +import com.android.dialer.compat.FilteredNumberCompat; import com.android.dialer.database.FilteredNumberAsyncQueryHandler; import com.android.dialer.filterednumber.BlockNumberDialogFragment; import com.android.dialer.filterednumber.FilteredNumbersUtil; +import com.android.dialer.filterednumber.MigrateBlockedNumbersDialogFragment; import com.android.dialer.logging.Logger; import com.android.dialer.logging.ScreenEvent; import com.android.dialer.service.ExtendedBlockingButtonRenderer; @@ -370,14 +372,11 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder public boolean onMenuItemClick(MenuItem item) { int resId = item.getItemId(); if (resId == R.id.context_menu_block_number) { - BlockNumberDialogFragment.show( - blockId, - number, - countryIso, - displayNumber, - R.id.floating_action_button_container, - ((Activity) mContext).getFragmentManager(), - mFilteredNumberDialogCallback); + FilteredNumberCompat + .showBlockNumberDialogFlow(blockId, number, countryIso, displayNumber, + R.id.floating_action_button_container, + ((Activity) mContext).getFragmentManager(), + mFilteredNumberDialogCallback); return true; } else if (resId == R.id.context_menu_copy_to_clipboard) { ClipboardUtils.copyText(mContext, null, number, true); -- cgit v1.2.3