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

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

Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0. 

Conflicts:
	res/values-zh-rCN/strings.xml

Change-Id: Ia13e9c7da4a4a3b40be2346685ac9add43567c0f
parents 4b9ac6ac b6e22e14

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

+13 −1
Original line number Diff line number Diff line
@@ -57,6 +57,18 @@ 
    <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"/>

    <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"
@@ -70,7 +82,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

+5 −0
Original line number Diff line number Diff line
@@ -221,4 +221,9 @@ 
    <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>

</resources>

res/values/donottranslate_config.xml

+4 −0
Original line number Diff line number Diff line
@@ -38,8 +38,12 @@ 


    <bool name="call_durationtype_enabled">false</bool>



    <bool name="add_multi_participants_enabled">false</bool>



    <bool name="ims_call_type_enabled">false</bool>



    <bool name="config_incoming_call_show_one_way_video_options">true</bool>



    <bool name="mark_emergency_call_in_call_log">false</bool>



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



</resources>