Add bottom sheet options for blocked and/or spam numbers in the new call log. (86135a2f) · Commits · e / os / android_packages_apps_Dialer

assets/quantum/res/drawable/quantum_ic_report_off_vd_theme_24.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2018 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?attr/colorControlNormal">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M11,7h2v2.92l6.91,6.91 1.09,-1.1L21,8.27L15.73,3L8.27,3L7.18,4.1 11,7.92zM22.27,21.73l-20,-20.01L1,2.99l3.64,3.64L3,8.27v7.46L8.27,21h7.46l1.64,-1.63L21,23l1.27,-1.27zM12,17.3c-0.72,0 -1.3,-0.58 -1.3,-1.3s0.58,-1.3 1.3,-1.3 1.3,0.58 1.3,1.3 -0.58,1.3 -1.3,1.3z"/>
		</vector>

java/com/android/dialer/calllog/ui/menu/Modules.java

+29 −10

Original line number	Diff line number	Diff line
		@@ -52,15 +52,8 @@ final class Modules {

		if (canPlaceCalls) {
		addModuleForVideoOrAudioCall(context, modules, row, normalizedNumber);

		SharedModules.maybeAddModuleForAddingToContacts(
		context,
		modules,
		row.number(),
		row.numberAttributes().getName(),
		row.numberAttributes().getLookupUri());

		SharedModules.maybeAddModuleForSendingTextMessage(context, modules, normalizedNumber);
		SharedModules.maybeAddModuleForSendingTextMessage(
		context, modules, normalizedNumber, row.numberAttributes().getIsBlocked());
		}

		if (!modules.isEmpty()) {
		@@ -68,10 +61,23 @@ final class Modules {
		}


		// TODO(zachh): Module for blocking/unblocking spam.
		// TODO(zachh): Module for CallComposer.

		if (canPlaceCalls) {
		SharedModules.maybeAddModuleForAddingToContacts(
		context,
		modules,
		row.number(),
		row.numberAttributes().getName(),
		row.numberAttributes().getLookupUri(),
		row.numberAttributes().getIsBlocked(),
		row.numberAttributes().getIsSpam());
		SharedModules.addModulesHandlingBlockedOrSpamNumber(
		context,
		modules,
		normalizedNumber,
		row.numberAttributes().getIsBlocked(),
		row.numberAttributes().getIsSpam());
		SharedModules.maybeAddModuleForCopyingNumber(context, modules, normalizedNumber);
		}

		@@ -89,10 +95,23 @@ final class Modules {
		List<ContactActionModule> modules,
		CoalescedRow row,
		String normalizedNumber) {
		// If a number is blocked, skip this menu item.
		if (row.numberAttributes().getIsBlocked()) {
		return;
		}

		PhoneAccountHandle phoneAccountHandle =
		TelecomUtil.composePhoneAccountHandle(
		row.phoneAccountComponentName(), row.phoneAccountId());

		// For a spam number, only audio calls are allowed.
		if (row.numberAttributes().getIsSpam()) {
		modules.add(
		IntentModule.newCallModule(
		context, normalizedNumber, phoneAccountHandle, CallInitiationType.Type.CALL_LOG));
		return;
		}

		if ((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) {
		// Add an audio call item for video calls. Clicking the top entry on the bottom sheet will
		// trigger a video call.

java/com/android/dialer/contactactions/IntentModule.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ public class IntentModule implements ContactActionModule {
		context,
		new CallIntentBuilder(number, initiationType)
		.setPhoneAccountHandle(phoneAccountHandle)),
		R.string.call,
		R.string.voice_call,
		R.drawable.quantum_ic_call_white_24);
		}

java/com/android/dialer/contactactions/SharedModules.java

+144 −12

Original line number	Diff line number	Diff line
		@@ -20,14 +20,15 @@ import android.content.Context;
		import android.content.Intent;
		import android.net.Uri;
		import android.provider.ContactsContract;
		import android.support.annotation.NonNull;
		import android.support.annotation.Nullable;
		import android.text.TextUtils;
		import android.widget.Toast;
		import com.android.dialer.DialerPhoneNumber;
		import com.android.dialer.clipboard.ClipboardUtils;
		import com.android.dialer.util.IntentUtil;
		import com.android.dialer.util.UriUtils;
		import java.util.List;
		import java.util.Locale;

		/**
		* Modules for the bottom sheet that are shared between NewVoicemailFragment and NewCallLogFragment
		@@ -37,10 +38,15 @@ public class SharedModules {
		public static void maybeAddModuleForAddingToContacts(
		Context context,
		List<ContactActionModule> modules,
		@NonNull DialerPhoneNumber number,
		@Nullable String name,
		@Nullable String lookupUri) {
		// TODO(zachh): Only show this for non-spam/blocked numbers.
		DialerPhoneNumber number,
		String name,
		String lookupUri,
		boolean isBlocked,
		boolean isSpam) {
		// Skip showing the menu item for a spam/blocked number.
		if (isBlocked \|\| isSpam) {
		return;
		}

		// Skip showing the menu item for existing contacts.
		if (isExistingContact(lookupUri)) {
		@@ -83,22 +89,148 @@ public class SharedModules {
		}

		public static void maybeAddModuleForSendingTextMessage(
		Context context, List<ContactActionModule> modules, String originalNumber) {
		Context context,
		List<ContactActionModule> modules,
		String normalizedNumber,
		boolean isBlocked) {
		// Don't show the option to send a text message if the number is blocked.
		if (isBlocked) {
		return;
		}

		// TODO(zachh): There are some conditions where this module should not be shown; consider
		// voicemail, business numbers, blocked numbers, spam numbers, etc.
		if (!TextUtils.isEmpty(originalNumber)) {
		// voicemail, business numbers, etc.

		if (!TextUtils.isEmpty(normalizedNumber)) {
		modules.add(
		new IntentModule(
		context,
		IntentUtil.getSendSmsIntent(originalNumber),
		IntentUtil.getSendSmsIntent(normalizedNumber),
		R.string.send_a_message,
		R.drawable.quantum_ic_message_vd_theme_24));
		}
		}

		public static void addModulesHandlingBlockedOrSpamNumber(
		Context context,
		List<ContactActionModule> modules,
		String normalizedNumber,
		boolean isBlocked,
		boolean isSpam) {
		// For a spam number, add two options:
		// (1) "Not spam" and "Block", or
		// (2) "Not spam" and "Unblock".
		if (isSpam) {
		addModuleForMarkingNumberAsNonSpam(context, modules, normalizedNumber);
		addModuleForBlockingOrUnblockingNumber(context, modules, normalizedNumber, isBlocked);
		return;
		}

		// For a blocked non-spam number, add "Unblock" option.
		if (isBlocked) {
		addModuleForBlockingOrUnblockingNumber(context, modules, normalizedNumber, isBlocked);
		return;
		}

		// For a number that is neither a spam number nor blocked, add "Block/Report spam" option.
		addModuleForBlockingNumberAndOptionallyReportingSpam(context, modules, normalizedNumber);
		}

		private static void addModuleForMarkingNumberAsNonSpam(
		Context context, List<ContactActionModule> modules, String normalizedNumber) {
		modules.add(
		new ContactActionModule() {
		@Override
		public int getStringId() {
		return R.string.not_spam;
		}

		@Override
		public int getDrawableId() {
		return R.drawable.quantum_ic_report_off_vd_theme_24;
		}

		@Override
		public boolean onClick() {
		// TODO(a bug): implement this method.
		Toast.makeText(
		context,
		String.format(Locale.ENGLISH, "TODO: Report %s as non-spam", normalizedNumber),
		Toast.LENGTH_SHORT)
		.show();
		return true; // Close the bottom sheet.
		}
		});
		}

		private static void addModuleForBlockingOrUnblockingNumber(
		Context context,
		List<ContactActionModule> modules,
		String normalizedNumber,
		boolean isBlocked) {
		modules.add(
		new ContactActionModule() {
		@Override
		public int getStringId() {
		return isBlocked ? R.string.unblock_number : R.string.block_number;
		}

		@Override
		public int getDrawableId() {
		return isBlocked
		? R.drawable.ic_unblock // TODO(a bug): use a vector icon
		: R.drawable.quantum_ic_block_vd_theme_24;
		}

		@Override
		public boolean onClick() {
		// TODO(a bug): implement this method.
		Toast.makeText(
		context,
		String.format(
		Locale.ENGLISH,
		"TODO: " + (isBlocked ? "Unblock " : "Block ") + " number %s.",
		normalizedNumber),
		Toast.LENGTH_SHORT)
		.show();
		return true; // Close the bottom sheet.
		}
		});
		}

		private static void addModuleForBlockingNumberAndOptionallyReportingSpam(
		Context context, List<ContactActionModule> modules, String normalizedNumber) {
		modules.add(
		new ContactActionModule() {
		@Override
		public int getStringId() {
		return R.string.block_and_optionally_report_spam;
		}

		@Override
		public int getDrawableId() {
		return R.drawable.quantum_ic_block_vd_theme_24;
		}

		@Override
		public boolean onClick() {
		// TODO(a bug): implement this method.
		Toast.makeText(
		context,
		String.format(
		Locale.ENGLISH,
		"TODO: Block and optionally report as spam %s.",
		normalizedNumber),
		Toast.LENGTH_SHORT)
		.show();
		return true; // Close the bottom sheet.
		}
		});
		}

		public static void maybeAddModuleForCopyingNumber(
		Context context, List<ContactActionModule> modules, String originalNumber) {
		if (TextUtils.isEmpty(originalNumber)) {
		Context context, List<ContactActionModule> modules, String normalizedNumber) {
		if (TextUtils.isEmpty(normalizedNumber)) {
		return;
		}
		modules.add(
		@@ -115,7 +247,7 @@ public class SharedModules {

		@Override
		public boolean onClick() {
		ClipboardUtils.copyText(context, null, originalNumber, true);
		ClipboardUtils.copyText(context, null, normalizedNumber, true);
		return false;
		}
		});

java/com/android/dialer/contactactions/res/drawable-xxxhdpi/ic_unblock.png

0 → 100644

+1.01 KiB

Loading image diff...