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

Commit 6e8046e4 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00020. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1070406   I9209abab7ba9c00f809251662583c1c73a9665ab   Settings: fix the "force close" in Settings at monkey-te
1069803   Id3bb0a6d829399b9aaecb4deccca266f3cf382e7   DeviceInfo:Add MBN Version For Global Pass Provisioning
1069255   Ic69a1c51cd2aeea8fcb064a01241718a8cfe36df   Settings:  Fix settings force close in monkey test.
1070422   I4cf00df1fa0abb42d66f21d1aa57612ad5e23369   Fix HotSpot first-use-help bug.
1076789   I7dd99c711fb2f45f8099e2f1a491e24d0ac9708d   Settings: Fix Crash when switch user
1064452   Idff8a187057c3a2eb11b5aca02678e552cf491dc   Settings: Remove "Bluetooth tethering"
1063182   I8a4f30b357a6e69538ded9a477bb0ffed5c3fb9d   Add VoLTE preferred set and query function
1046807   I9e17e6ca7e53c745b9b209d5502c209ac2b4e5df   Settings: "Back" icon not work on Settings-Security-Encr
921821   I6699e7e2942c017f197afb0da91f60363a5f03d1   Settings: 8996 MTP  "APN Protocol" and "APN Roaming Prot
1068743   Iaa29d35f7ff3054258e1925059fe81ec444a328a   Settings: Occurred "com.android.phone" force close 9 tim
1076863   Ic592aef46b63e9565e0a51235b0c214f8e0c78e1   Settings: Add CMCC wifi extension feature

Change-Id: I6131b1a1ad4d8ae41a76dad2fcbe1cfa64054e68
CRs-Fixed: 1068743, 921821, 1063182, 1076789, 1069803, 1070422, 1076863, 1046807, 1070406, 1064452, 1069255
parents 28c2392a 07921b72

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
    <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />

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

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

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



    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher_settings"

res/values-zh-rCN/strings.xml

100755 → 100644
+3 −0
Original line number Diff line number Diff line
@@ -3129,6 +3129,9 @@ 
    <string name="notify_connect">连接CMCC告警</string>

    <string name="notify_connect_summary">连接到CMCC热点后提示</string>

    <string name="wifi_setting_connect_type_error">设置自动连接类型时出现错误。</string>

    <string name="wifi_advanced_gateway">网关</string>

    <string name="wifi_advanced_network_netmask">子网掩码</string>



    <string name="label_global_roaming_settings">国际漫游设置</string>

    <string name="set_data_time_range">显示时间区间</string>

    <string name="app_ops_permiss_name">应用联网限制</string>

res/values/bools.xml

+2 −0
Original line number Diff line number Diff line
@@ -106,4 +106,6 @@ 
    <bool name="config_hide_mms_enable">false</bool>

    <!-- show pop up notification for turn off wifi begin -->

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

    <!-- Whether to enable the default ipv4/v6 for creating new APN -->

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

</resources>

res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -89,4 +89,6 @@ 
    <string-array translatable="false" name="carrier_operator_list">

    </string-array>

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

    <!-- Config to show bluetooth menu-->

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

</resources>

res/values/strings.xml

100755 → 100644
+4 −0
Original line number Diff line number Diff line
@@ -7548,6 +7548,9 @@ 
    <string name="notify_connect">CMCC WLAN prompt</string>

    <string name="notify_connect_summary">Prompt me when access to CMCC WLAN</string>

    <string name="wifi_setting_connect_type_error">There was a problem setting the connect type.</string>

    <string name="wifi_advanced_gateway">Gateway</string>

    <string name="wifi_advanced_network_netmask">Netmask</string>









    <string name="app_ops_permiss_name">App network access</string>

















    <!-- Roaming Data Settings -->








@@ -7577,6 +7580,7 @@







    <string name="turn_on_wifi_dialog_title">Turn on wifi</string>









    <string name="turn_on_wifi_dialog_text">Wi-Fi is turned off when Mobile HotSpot is active. To turn on Wi-Fi, please turn off Mobile HotSpot.</string>









    <string name="dialog_not_show_again">Do not show again</string>









    <string name="volte_preferred">Volte Preferred</string>









    <string name="tethering_settings_summary">Share your device\'s mobile data connection via USB or a Mobile HotSpot</string>

















    <string name="collect_diagnostics_title">Collect Diagnostics</string>