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

Commit 9507e5f2 authored by SongFerng Wang's avatar SongFerng Wang Committed by android-build-merger
Browse files

Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca 

am: 951e9b77

Change-Id: Ifa44c34f2653e6e1146a9a6337f411761cc1ce17
parents 24b3051e 951e9b77

res/values/arrays.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -1234,7 +1234,7 @@ 
        <item>LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA</item>

        <item>LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA</item>

        <item>NR only</item>

        <item>NR only</item>

        <item>NR/LTE</item>

        <item>NR/LTE</item>

        <item>NR/LTE/CDME/EvDo</item>

        <item>NR/LTE/CDMA/EvDo</item>

        <item>NR/LTE/GSM/WCDMA</item>

        <item>NR/LTE/GSM/WCDMA</item>

        <item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item>

        <item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item>

        <item>NR/LTE/WCDMA</item>

        <item>NR/LTE/WCDMA</item>

res/values/strings.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -10896,8 +10896,8 @@ 
    <string name="preferred_network_mode_nr_only_summary">Preferred network mode: NR only</string>

    <string name="preferred_network_mode_nr_only_summary">Preferred network mode: NR only</string>

    <!-- NR / LTE [CHAR LIMIT=NONE] -->

    <!-- NR / LTE [CHAR LIMIT=NONE] -->

    <string name="preferred_network_mode_nr_lte_summary">Preferred network mode: NR / LTE</string>

    <string name="preferred_network_mode_nr_lte_summary">Preferred network mode: NR / LTE</string>

    <!-- NR/LTE/CDME/EvDo [CHAR LIMIT=NONE] -->

    <!-- NR/LTE/CDMA/EvDo [CHAR LIMIT=NONE] -->

    <string name="preferred_network_mode_nr_lte_cdma_evdo_summary">Preferred network mode: NR/LTE/CDME/EvDo</string>

    <string name="preferred_network_mode_nr_lte_cdma_evdo_summary">Preferred network mode: NR/LTE/CDMA/EvDo</string>

    <!-- NR/LTE/GSM/WCDMA [CHAR LIMIT=NONE] -->

    <!-- NR/LTE/GSM/WCDMA [CHAR LIMIT=NONE] -->

    <string name="preferred_network_mode_nr_lte_gsm_wcdma_summary">Preferred network mode: NR/LTE/GSM/WCDMA</string>

    <string name="preferred_network_mode_nr_lte_gsm_wcdma_summary">Preferred network mode: NR/LTE/GSM/WCDMA</string>

    <!-- NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->

    <!-- NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->