Merge "Dialer:add black and white list menu" (695694bb) · Commits · e / os / android_packages_apps_Dialer

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ LOCAL_AAPT_FLAGS := \
		--extra-packages com.android.phone.common

		LOCAL_JAVA_LIBRARIES := telephony-common
		LOCAL_JAVA_LIBRARIES += rcs_service_api
		LOCAL_STATIC_JAVA_LIBRARIES := \
		com.android.services.telephony.common \
		com.android.vcard \

AndroidManifest.xml

100755 → 100644

+13 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,18 @@
		presses home. -->
		<uses-permission android:name="android.permission.STOP_APP_SWITCHES" />
		<uses-permission android:name="com.qualcomm.permission.USE_PHONE_SERVICE" />
		<uses-permission android:name="com.android.firewall.READ_GRAVITY"/>
		<uses-permission android:name="com.android.firewall.WRITE_GRAVITY"/>
		<uses-permission android:name="android.permission.READ_SMS"/>
		<uses-permission android:name="android.permission.WRITE_SMS"/>
		<!-- RCS -->
		<uses-permission android:name="android.permission.INTERNET" />
		<!-- wifi -->
		<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
		<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
		<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
		<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
		<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

		<application
		android:name="DialerApplication"
		@@ -69,7 +81,7 @@
		android:value="AEdPqrEAAAAIBXgtCEKQ6W0PXVnW-ZVia2KmlV2AxsTw3GjAeQ" />

		<uses-library android:name="com.qualcomm.qti.smartsearch" />

		<uses-library android:name="com.suntek.mway.rcs.client.api" android:required="false" />
		<!-- The entrance point for Phone UI.
		stateAlwaysHidden is set to suppress keyboard show up on
		dialpad screen. -->

res/values-zh-rCN/strings.xml

+6 −1

Original line number	Diff line number	Diff line
		@@ -216,9 +216,14 @@
		<string name="call_log_show_all_slots">"所有卡"</string>
		<string name="call_log_all_calls_header">"所有通话"</string>
		<string name="calllog_search_hint">"搜索通话记录"</string>

		<string name="firewall_number_len_not_valid">号码错误</string>
		<string name="firewall_number_in_black">"该号码已在黑名单中"</string>
		<string name="firewall_number_in_white">"该号码已在白名单中"</string>
		<string name="firewall_save_success">保存成功</string>
		<string name="firewall_add_blacklist_warning">如果将该号码加入黑名单，你将不会再收到该号码的消息和来电</string>
		<string name="add_to_white_list">加入白名单</string>
		<string name="add_to_black_list">加入黑名单</string>
		<string name="video_call">视频电话</string>
		<string name="menu_add_to_4g_conference_call">加入4G电话会议</string>

		</resources>

res/values/strings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -841,5 +841,10 @@
		<string name="add_to_white_list">Add to white list</string>
		<string name="add_to_black_list">Add to black list</string>
		<string name="dialog_title">Tip</string>
		<string name="firewall_number_len_not_valid">Number is wrong</string>
		<string name="firewall_number_in_black">"Number already in blacklist"</string>
		<string name="firewall_number_in_white">"Number already in whitelist"</string>
		<string name="firewall_save_success">Saved successfully</string>
		<string name="firewall_add_blacklist_warning">if you add this number to blacklsit, you will not receive the messages and calls from it</string>

		</resources>

src/com/android/dialer/CallDetailActivity.java

100755 → 100644

+72 −17

Original line number	Diff line number	Diff line
		@@ -51,6 +51,10 @@ import android.widget.LinearLayout;
		import android.widget.ListView;
		import android.widget.TextView;
		import android.widget.Toast;
		import android.app.AlertDialog;
		import android.app.Dialog;
		import android.content.DialogInterface.OnClickListener;
		import android.content.DialogInterface;

		import com.android.contacts.common.CallUtil;
		import com.android.contacts.common.GeoUtil;
		@@ -87,6 +91,11 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe
		private static final int LOADER_ID = 0;
		private static final String BUNDLE_CONTACT_URI_EXTRA = "contact_uri_extra";

		//add firewall menu
		private static final Uri WHITELIST_CONTENT_URI = Uri
		.parse("content://com.android.firewall/whitelistitems");
		private static final Uri BLACKLIST_CONTENT_URI = Uri
		.parse("content://com.android.firewall/blacklistitems");
		/** The time to wait before enabling the blank the screen due to the proximity sensor. */
		private static final long PROXIMITY_BLANK_DELAY_MILLIS = 100;
		/** The time to wait before disabling the blank the screen due to the proximity sensor. */
		@@ -642,26 +651,72 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe

		public void onMenuAddToBlackList(MenuItem menuItem) {
		Bundle blackBundle = new Bundle();
		blackBundle.putString(NUMBER_KEY, mNumber);
		blackBundle.putString(MODE_KEY, "blacklist");
		new AlertDialog.Builder(this)
		.setMessage(getString(R.string.firewall_add_blacklist_warning))
		.setPositiveButton(android.R.string.ok, new OnClickListener() {
		@Override
		public void onClick(DialogInterface dialog, int which) {
		if (addNumberToFirewall(mNumber, true)) {
		Toast.makeText(CallDetailActivity.this,
		getString(R.string.firewall_save_success),
		Toast.LENGTH_SHORT).show();
		}
		}
		})
		.setNegativeButton(android.R.string.cancel, null)
		.create().show();

		Intent blackIntent = new Intent();
		blackIntent.setClassName(FIREWALL_APK_NAME, FIREWALL_BLACK_WHITE_LIST);
		blackIntent.setAction(Intent.ACTION_INSERT);
		blackIntent.putExtras(blackBundle);
		startActivity(blackIntent);
		}

		public void onMenuAddToWhiteList(MenuItem menuItem) {
		Bundle whiteBundle = new Bundle();
		whiteBundle.putString(NUMBER_KEY, mNumber);
		whiteBundle.putString(MODE_KEY, "whitelist");

		Intent whiteIntent = new Intent();
		whiteIntent.setClassName(FIREWALL_APK_NAME, FIREWALL_BLACK_WHITE_LIST);
		whiteIntent.setAction(Intent.ACTION_INSERT);
		whiteIntent.putExtras(whiteBundle);
		startActivity(whiteIntent);
		if (addNumberToFirewall(mNumber, true)) {
		Toast.makeText(CallDetailActivity.this,
		getString(R.string.firewall_save_success),
		Toast.LENGTH_SHORT).show();
		}

		}

		private boolean addNumberToFirewall(String number, boolean isBlacklist) {
		Log.d(TAG, "number: " + number);
		if (TextUtils.isEmpty(number)) {
		Toast.makeText(CallDetailActivity.this,
		getString(R.string.firewall_number_len_not_valid),
		Toast.LENGTH_SHORT).show();
		return false;
		}
		ContentValues values = new ContentValues();
		String queryNumber = number.replaceAll("[\\-\\/ ]", "");
		int len = queryNumber.length();
		if (len > 11){
		queryNumber = number.substring(len - 11, len);
		}
		Uri firewallUri = isBlacklist? BLACKLIST_CONTENT_URI: WHITELIST_CONTENT_URI;
		Cursor firewallCursor = getContentResolver().query(firewallUri,
		new String[] {
		"_id", "number", "person_id", "name"
		},
		"number" + " LIKE '%" + queryNumber + "'",
		null,
		null);
		if (firewallCursor != null){
		if (firewallCursor.getCount() > 0) {
		firewallCursor.close();
		firewallCursor = null;
		String toastString = isBlacklist? getString(R.string.firewall_number_in_black)
		: getString(R.string.firewall_number_in_white);
		Toast.makeText(CallDetailActivity.this, toastString,
		Toast.LENGTH_SHORT).show();
		return false;
		}
		firewallCursor.close();
		firewallCursor = null;
		}
		values.put("number", queryNumber);
		values.put("name", "");
		// add new
		getContentResolver().insert(firewallUri, values);
		return true;
		}

		public void onMenuRemoveFromCallLog(MenuItem menuItem) {