Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61899450 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge remote-tracking branch 'caf/LA.BR.1.2.3_1' into caf/cm-12.1 

Conflicts:
	res/layout/add_speed_dial_dialog.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/dialer/CallDetailActivity.java
	src/com/android/dialer/PhoneCallDetails.java
	src/com/android/dialer/SpecialCharSequenceMgr.java
	src/com/android/dialer/calllog/CallLogQueryHandler.java
	src/com/android/dialer/calllog/SpinnerContent.java
	src/com/android/dialer/callstats/CallStatsQueryHandler.java
	src/com/android/dialer/dialpad/DialpadFragment.java

Change-Id: Ifb295da1d60278795ffc0e1fbbce55163e17c041
parents 3af2123e 1bebee89

AndroidManifest.xml

100755 → 100644
+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
     start requests, even if they happen immediately after the user

     presses home. -->

    <uses-permission android:name="android.permission.STOP_APP_SWITCHES" />

    <uses-permission android:name="android.permission.RECORD_AUDIO" />

    <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"/>

res/layout/add_speed_dial_dialog.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

res/values-zh-rCN/strings.xml

+7 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- 

  ~ Copyright (C) 2013-2015 The Linux Foundation. All Rights Reserved.

  ~ Copyright (C) 2013-2014 The Linux Foundation. All Rights Reserved.

  ~ Not a Contribution.

  ~ Copyright (C) 2012 The Android Open Source Project

  ~
@@ -218,16 +218,16 @@ 
    <string name="call_log_show_all_slots">"所有卡"</string>

    <string name="call_log_all_calls_header">"所有通话"</string>

    <string name="calllog_search_hint">"搜索通话记录"</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>

    <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_wring">如果将该号码加入黑名单，你将不会再收到该号码的消息和来电</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>



    <string name="set_speed_dial">快速拨号设置</string>

    <string name="input_number">"输入号码"</string>

    <string name="speed_dial_cancel">"取消"</string>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2013-2015 The Linux Foundation. All Rights Reserved.

  ~ Copyright (C) 2013-2014 The Linux Foundation. All Rights Reserved.

  ~ Not a Contribution.

  ~ Copyright (C) 2012 The Android Open Source Project

  ~
@@ -847,7 +847,7 @@ 
    <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_wring">if you add this number to blacklsit, you will not receive the messages and calls from it</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>



    <string name="set_speed_dial">Speed dial settings</string>

    <string name="input_number">Input Number</string>

src/com/android/dialer/CallDetailActivity.java

100755 → 100644
+21 −22
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe 
                final int numberPresentation = firstDetails.numberPresentation;

                final Uri contactUri = firstDetails.contactUri;

                final Uri photoUri = firstDetails.photoUri;

                final long subId = firstDetails.accountId;

                final int subId = firstDetails.accountId;



                // Set the details header, based on the first phone call.

                mCallDetailHeader.updateViews(firstDetails);
@@ -516,9 +516,9 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe 
                    callCursor.getString(ACCOUNT_COMPONENT_NAME),

                    callCursor.getString(ACCOUNT_ID)));

            String accId = callCursor.getString(ACCOUNT_ID);

            long subId = SubscriptionManager.DEFAULT_SUB_ID;

            int subId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;

            if (accId!=null && !accId.equals("E") && !accId.toLowerCase().contains("sip")) {

                subId = Long.parseLong(accId);

                subId = Integer.parseInt(accId);

            }



            if (TextUtils.isEmpty(countryIso)) {
@@ -656,11 +656,11 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe 
    public void onMenuAddToBlackList(MenuItem menuItem) {

        Bundle blackBundle = new Bundle();

        new AlertDialog.Builder(this)

            .setMessage(getString(R.string.firewall_add_blacklist_wring))

            .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(true , mNumber)){

                    if (addNumberToFirewall(mNumber, true)) {

                        Toast.makeText(CallDetailActivity.this,

                            getString(R.string.firewall_save_success),

                                Toast.LENGTH_SHORT).show();
@@ -673,7 +673,7 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe 
    }



    public void onMenuAddToWhiteList(MenuItem menuItem) {

        if(addNumberToFirewall(false , mNumber)){

        if (addNumberToFirewall(mNumber, true)) {

             Toast.makeText(CallDetailActivity.this,

                getString(R.string.firewall_save_success),

                    Toast.LENGTH_SHORT).show();
@@ -681,7 +681,7 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe 


    }



    private boolean addNumberToFirewall(boolean isBlacklist,String number){

    private boolean addNumberToFirewall(String number, boolean isBlacklist) {

        Log.d(TAG, "number: " + number);

         if (TextUtils.isEmpty(number)) {

            Toast.makeText(CallDetailActivity.this,
@@ -689,7 +689,6 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe 
                    Toast.LENGTH_SHORT).show();

            return false;

        }

        boolean ret = true;

        ContentValues values = new ContentValues();

        String queryNumber = number.replaceAll("[\\-\\/ ]", "");

        int len = queryNumber.length();
@@ -697,31 +696,31 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe 
            queryNumber = number.substring(len - 11, len);

        }

        Uri firewallUri = isBlacklist? BLACKLIST_CONTENT_URI: WHITELIST_CONTENT_URI;

        Cursor fiewallCursor = getContentResolver().query(firewallUri,

        Cursor firewallCursor = getContentResolver().query(firewallUri,

                new String[] {

                        "_id", "number", "person_id", "name"

                },

                "number" + " LIKE '%" + queryNumber + "'",

                null,

                null);

        if (fiewallCursor != null){

            if (fiewallCursor.getCount() > 0) {

                fiewallCursor.close();

                fiewallCursor = null;

                 String Stoast = isBlacklist?getString(R.string.firewall_number_in_black)

        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, Stoast,

                Toast.makeText(CallDetailActivity.this, toastString,

                    Toast.LENGTH_SHORT).show();

                return false;

            }

            fiewallCursor.close();

            fiewallCursor = null;

            firewallCursor.close();

            firewallCursor = null;

        }

        values.put("number", queryNumber);

        values.put("name", "");

        // add new

        Uri mUri = getContentResolver().insert(firewallUri, values);

        return ret;

        getContentResolver().insert(firewallUri, values);

        return true;

    }



    public void onMenuRemoveFromCallLog(MenuItem menuItem) {