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

Commit 86a45945 authored by Grace Jia's avatar Grace Jia
Browse files

Add new API for new feature of display name in Japanese. 

Bug: 181383364
Test: BlockedNumberProvider test
Change-Id: Ic6eda318038a7ea02f44b99bb6245687751787be
parent 7b0e8297

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -356,6 +356,10 @@ 
    <string name="phone_settings_unknown_txt">Unknown</string>

    <!-- Explanatory text under the call type "phone_settings_unknown_txt". This occurs when no caller ID information unavailable (e.g., international calls, IP phones that operators cannot identify the caller) -->

    <string name="phone_settings_unknown_summary_txt">Block calls from unidentified callers</string>

    <!-- Call type to be blocked. See the explanatory text "phone_settings_unavailable_summary_txt".  -->

    <string name="phone_settings_unavailable_txt">Unavailable</string>

    <!-- Explanatory text under the call type "phone_settings_unavailable_txt". -->

    <string name="phone_settings_unavailable_summary_txt">Block calls where the number is unavailable</string>

    <!-- Notification. Make this translation consistent with "phone_settings_call_blocking_txt". -->

    <string name="phone_strings_call_blocking_turned_off_notification_title_txt">Call Blocking</string>

    <!-- Notification that appears when the feature Call Blocking has been disabled. -->

res/xml/enhanced_call_blocking_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -40,5 +40,11 @@ 
        android:summary="@string/phone_settings_unknown_summary_txt"

        android:persistent="false"

        android:defaultValue="false"/>

    <SwitchPreference

        android:key="block_unavailable_calls_setting"

        android:title="@string/phone_settings_unavailable_txt"

        android:summary="@string/phone_settings_unavailable_summary_txt"

        android:persistent="false"

        android:defaultValue="false"/>

    <!--Add divider to separate this enhanced call blocking settings from other settings-->

</PreferenceScreen>
 
 No newline at end of file

src/com/android/server/telecom/Call.java

+3 −0
Original line number Diff line number Diff line
@@ -997,6 +997,9 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
            case TelecomManager.PRESENTATION_UNKNOWN:

                s.append("Unknown");

                break;

            case TelecomManager.PRESENTATION_UNAVAILABLE:

                s.append("Unavailable");

                break;

            default:

                s.append("<undefined>");

        }

src/com/android/server/telecom/callfiltering/BlockCheckerFilter.java

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ public class BlockCheckerFilter extends CallFilter { 
                return CallLog.Calls.BLOCK_REASON_BLOCKED_NUMBER;



            case BlockedNumberContract.STATUS_BLOCKED_UNKNOWN_NUMBER:

            case BlockedNumberContract.STATUS_BLOCKED_UNAVAILABLE:

                return CallLog.Calls.BLOCK_REASON_UNKNOWN_NUMBER;



            case BlockedNumberContract.STATUS_BLOCKED_RESTRICTED:

src/com/android/server/telecom/settings/BlockedNumbersActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.telecom.settings; 
import android.annotation.Nullable;

import android.app.ActionBar;

import android.app.AlertDialog;

import android.app.Dialog;

import android.app.Fragment;

import android.app.FragmentManager;

import android.app.FragmentTransaction;
@@ -35,14 +34,13 @@ import android.content.Loader; 
import android.database.Cursor;

import android.os.Bundle;

import android.provider.BlockedNumberContract;

import android.provider.ContactsContract;

import android.telephony.PhoneNumberFormattingTextWatcher;

import android.telephony.PhoneNumberUtils;

import android.telephony.TelephonyManager;

import android.text.Editable;

import android.text.InputType;

import android.text.TextUtils;

import android.text.TextWatcher;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.MenuItem;

import android.view.View;