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

Commit 59f5eb63 authored by Calvin Pan's avatar Calvin Pan Committed by Android (Google) Code Review
Browse files

Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev

parents 873b50a4 75867d8f

res/values/arrays.xml

+0 −83
Original line number Diff line number Diff line
@@ -1375,89 +1375,6 @@ 
        <item>"1"</item>

    </string-array>



    <string-array name="enabled_networks_except_gsm_choices" translatable="false">

        <item>@string/network_lte</item>

        <item>@string/network_3G</item>

    </string-array>

    <string-array name="enabled_networks_except_gsm_4g_choices" translatable="false">

        <item>@string/network_4G</item>

        <item>@string/network_3G</item>

    </string-array>

    <string-array name="enabled_networks_except_gsm_values" translatable="false">

        <item>"9"</item>

        <item>"0"</item>

    </string-array>



    <string-array name="enabled_networks_except_lte_choices" translatable="false">

        <item>@string/network_3G</item>

        <item>@string/network_2G</item>

    </string-array>

    <string-array name="enabled_networks_except_lte_values" translatable="false">

        <item>"0"</item>

        <item>"1"</item>

    </string-array>



    <string-array name="enabled_networks_except_gsm_lte_choices" translatable="false">

        <item>@string/network_3G</item>

    </string-array>

    <string-array name="enabled_networks_except_gsm_lte_values" translatable="false">

        <item>"0"</item>

    </string-array>



    <string-array name="enabled_networks_cdma_choices" translatable="false">

        <item>@string/network_lte</item>

        <item>@string/network_3G</item>

        <item>@string/network_1x</item>

        <item>@string/network_global</item>

    </string-array>

    <string-array name="enabled_networks_cdma_values" translatable="false">

        <item>"8"</item>

        <item>"4"</item>

        <item>"5"</item>

        <item>"10"</item>

    </string-array>



    <string-array name="enabled_networks_cdma_no_lte_choices" translatable="false">

        <item>@string/network_3G</item>

        <item>@string/network_1x</item>

    </string-array>

    <string-array name="enabled_networks_cdma_no_lte_values" translatable="false">

        <item>"4"</item>

        <item>"5"</item>

    </string-array>



    <string-array name="enabled_networks_cdma_only_lte_choices" translatable="false">

        <item>@string/network_lte</item>

        <item>@string/network_global</item>

    </string-array>

    <string-array name="enabled_networks_cdma_only_lte_values" translatable="false">

        <item>"8"</item>

        <item>"10"</item>

    </string-array>



    <string-array name="enabled_networks_tdscdma_choices" translatable="false">

        <item>@string/network_lte</item>

        <item>@string/network_3G</item>

        <item>@string/network_2G</item>

    </string-array>

    <string-array name="enabled_networks_tdscdma_values" translatable="false">

        <item>"22"</item>

        <item>"18"</item>

        <item>"1"</item>

    </string-array>



    <!--String arrays for World preferred netwrok modes -->

    <string-array name="preferred_network_mode_choices_world_mode">

        <item>Global</item>

        <item>LTE / CDMA</item>

        <item>LTE / GSM / UMTS</item>

    </string-array>



    <string-array name="preferred_network_mode_values_world_mode" translatable="false">

        <item>"10"</item>

        <item>"8"</item>

        <item>"9"</item>

    </string-array>



    <!-- WiFi calling mode array -->

    <string-array name="wifi_calling_mode_summaries" translatable="false">

res/values/strings.xml

+5 −1
Original line number Diff line number Diff line
@@ -11301,7 +11301,11 @@ 
    <!-- Text for Network 1x [CHAR LIMIT=NONE] -->

    <string name="network_1x" translatable="false">1x</string>

    <!-- Text for Network global [CHAR LIMIT=NONE] -->

    <string name="network_global">Global</string>

    <string name="network_global" translatable="false">Global</string>

    <!-- Text for Network world mode CDMA LTE [CHAR LIMIT=NONE] -->

    <string name="network_world_mode_cdma_lte" translatable="false">LTE / CDMA</string>

    <!-- Text for Network world mode GSM LTE [CHAR LIMIT=NONE] -->

    <string name="network_world_mode_gsm_lte" translatable="false">LTE / GSM / UMTS</string>









    <!-- Available networks screen title/heading [CHAR LIMIT=NONE] -->









    <string name="label_available">Available networks</string>