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

Commit 6e10c3d7 authored by Qiang Chen's avatar Qiang Chen Committed by Linux Build Service Account
Browse files

SystemUI: Add RAT and translation for carrier SPN/PLMN strings 

  - Update SPN/PLMN strings to locale strings on status bar and
    lock screen when system languages change
  - Add 2G/3G/4G RAT after SPN/PLMN string on status bar and
    lock screen
  - Add config to control these features

Conflicts:
core/res/res/values/config.xml
Change-Id: Icbc79bf259ea40792ff59e4fcc04d883e7797f8c
parent be946ffc

core/res/res/values-zh-rCN/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1852,4 +1852,9 @@ 
        <item>试图删除通话记录</item>

        <item>试图打开移动数据</item>

    </string-array>



    <!-- Carrier Name -->

    <string name="China_Mobile">中国移动</string>

    <string name="China_Unicom">中国联通</string>

    <string name="China_Telecom">中国电信</string>

</resources>

core/res/res/values-zh-rHK/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1783,4 +1783,9 @@ 
    <item quantity="other" msgid="5408537517529822157">"%d 小時"</item>

  </plurals>

    <string name="zen_mode_forever" msgid="4316804956488785559">"無限期"</string>



    <!-- Carrier Name -->

    <string name="China_Mobile">中國移動</string>

    <string name="China_Unicom">中國聯通</string>

    <string name="China_Telecom">中國電信</string>

</resources>

core/res/res/values/config.xml

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

<?xml version="1.0" encoding="utf-8"?>

<!--

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

** Not a Contribution.
@@ -1893,6 +1893,52 @@ 
    <!-- Configuartion to support SIM refresh in STK command for dual mode card.-->

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



    <string-array name="origin_carrier_names">

        <item>CHINA\u0020\u0020MOBILE</item>

        <item>CMCC</item>

        <item>CHN-UNICOM</item>

        <item>China Mobile</item>

        <item>China Unicom</item>

        <item>China Telecom</item>

        <item>中国移动</item>

        <item>中国联通</item>

        <item>中国电信</item>

        <item>中國移動</item>

        <item>中國聯通</item>

        <item>中國電信</item>

        <item>Searching for Service</item>

    </string-array>



    <string-array name="locale_carrier_names">

        <item>China_Mobile</item>

        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Telecom</item>

        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Telecom</item>

        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Telecom</item>

        <item>roamingTextSearching</item>

    </string-array>



    <!-- monitor locale change -->

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



    <!-- display for radio tech -->

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



    <!-- spn display control -->

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



    <!-- config 2G/3G/4G RAT strings for carriers -->

    <string name="config_rat_2g" translatable="false">2G</string>

    <string name="config_rat_3g" translatable="false">3G</string>

    <string name="config_rat_4g" translatable="false">4G</string>



    <!-- Configuration that determines if ACTIVATE_REJECT_GGSN is to be treated as

         a permanent error -->

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

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -4919,6 +4919,11 @@ 
    <string name="stk_cc_ss_to_ussd">SS request is modified to USSD request.</string>

    <string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string>



    <!-- Carrier Name -->

    <string name="China_Mobile">China Mobile</string>

    <string name="China_Unicom">China Unicom</string>

    <string name="China_Telecom">China Telecom</string>



    <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->

    <string name="permission_remember_choice">Remember</string>

    <string name="permission">Permission</string>

core/res/res/values/symbols.xml

+17 −1
Original line number Diff line number Diff line
@@ -2120,6 +2120,23 @@ 
  <!-- sim refresh for dual mode card -->

  <java-symbol type="bool" name="config_sim_refresh_for_dual_mode_card" />



  <!-- config 2G/3G/4G RAT strings for carriers -->

  <java-symbol type="string" name="config_rat_2g" />

  <java-symbol type="string" name="config_rat_3g" />

  <java-symbol type="string" name="config_rat_4g" />



  <!-- spn display control -->

  <java-symbol type="bool" name="config_spn_display_control" />



  <!-- monitor locale change -->

  <java-symbol type="bool" name="config_monitor_locale_change" />



  <!-- display for radio tech -->

  <java-symbol type="bool" name="config_display_rat" />



  <java-symbol type="array" name="origin_carrier_names" />

  <java-symbol type="array" name="locale_carrier_names" />



  <!-- Data Connectivity Error Configurations -->

  <java-symbol type="bool" name="config_reject_ggsn_perm_failure" />

  <java-symbol type="bool" name="config_protocol_errors_perm_failure" />
@@ -2129,5 +2146,4 @@ 


  <!-- cpu boost for horizontal scroll -->

  <java-symbol type="bool" name="config_enableCpuBoostForScroller" />



</resources>