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

Commit dc5149ef authored by SongFerngWang's avatar SongFerngWang Committed by SongFerng Wang
Browse files

RadioInfo network mode list and network mode string add 5G 

Bug: 131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
Merged-In: I945d3c2fd175f45151bbeee475e388ccc2d67642
parent 92eb42c6

res/values/arrays.xml

+22 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,17 @@ 
        <item>LTE/TDSCDMA/GSM/WCDMA</item>

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

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

        <item>NR only</item>

        <item>NR/LTE</item>

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

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

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

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

        <item>NR/LTE/TDSCDMA</item>

        <item>NR/LTE/TDSCDMA/GSM</item>

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

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

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

    </string-array>

    <!-- The preferred network modes RIL constants, in order of the modes above,

         e.g. the choice "GSM/WCDMA preferred" has the corresponding value "0" -->
@@ -1259,6 +1270,17 @@ 
        <item>"20"</item>

        <item>"21"</item>

        <item>"22"</item>

        <item>"23"</item>

        <item>"24"</item>

        <item>"25"</item>

        <item>"26"</item>

        <item>"27"</item>

        <item>"28"</item>

        <item>"29"</item>

        <item>"30"</item>

        <item>"31"</item>

        <item>"32"</item>

        <item>"33"</item>

    </string-array>



    <!-- Choices for CDMA subscription-->

res/values/strings.xml

+33 −1
Original line number Diff line number Diff line
@@ -10839,6 +10839,8 @@ 
    <string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>

    <!-- CDMA+LTE/EVDO [CHAR LIMIT=NONE] -->

    <string name="preferred_network_mode_lte_cdma_evdo_summary">Preferred network mode: CDMA+LTE/EVDO</string>

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

    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE/CDMA/EvDo/GSM/WCDMA</string>

    <!-- Global [CHAR LIMIT=NONE] -->

    <string name="preferred_network_mode_global_summary">Preferred network mode: Global</string>

    <!-- LTE / WCDMA [CHAR LIMIT=NONE] -->
@@ -10867,7 +10869,37 @@ 
    <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>

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

    <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>













    <!-- NR only [CHAR LIMIT=NONE] -->













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













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













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













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













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













    <!-- 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>













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













    <string name="preferred_network_mode_nr_lte_cdma_evdo_gsm_wcdma_summary">Preferred network mode: NR/LTE/CDMA/EvDo/GSM/WCDMA</string>













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













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













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













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













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













    <string name="preferred_network_mode_nr_lte_tdscdma_gsm_summary">Preferred network mode: NR/LTE/TDSCDMA/GSM</string>













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













    <string name="preferred_network_mode_nr_lte_tdscdma_wcdma_summary">Preferred network mode: NR/LTE/TDSCDMA/WCDMA</string>













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













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













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













    <string name="preferred_network_mode_nr_lte_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>

























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













    <string name="network_recommended">\u0020(recommended)</string>













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













    <string name="network_5G" translatable="false">5G</string>













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













    <string name="network_lte_pure" translatable="false">LTE</string>













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













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















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















    <string name="network_lte">LTE (recommended)</string>















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

























src/com/android/settings/RadioInfo.java



+28
−16




























Original line number
Diff line number
Diff line








@@ -101,28 +101,40 @@ public class RadioInfo extends Activity {













    private static final String TAG = "RadioInfo";































    private static final String[] mPreferredNetworkLabels = {













            "WCDMA preferred",













            "GSM/WCDMA preferred",















            "GSM only",















            "WCDMA only",













            "GSM auto (PRL)",













            "CDMA auto (PRL)",













            "GSM/WCDMA auto (PRL)",













            "CDMA/EvDo auto (PRL)",















            "CDMA only",















            "EvDo only",













            "Global auto (PRL)",













            "LTE/CDMA auto (PRL)",













            "LTE/UMTS auto (PRL)",













            "LTE/CDMA/UMTS auto (PRL)",













            "CDMA/EvDo/GSM/WCDMA (PRL)",













            "CDMA + LTE/EvDo (PRL)",













            "GSM/WCDMA/LTE (PRL)",













            "LTE/CDMA/EvDo/GSM/WCDMA (PRL)",















            "LTE only",















            "LTE/WCDMA",













            "TD-SCDMA only",













            "TD-SCDMA/WCDMA",













            "LTE/TD-SCDMA",













            "TD-SCDMA/GSM",













            "TD-SCDMA/UMTS",













            "LTE/TD-SCDMA/WCDMA",













            "LTE/TD-SCDMA/UMTS",













            "TD-SCDMA/CDMA/UMTS",













            "Global/TD-SCDMA",













            "TDSCDMA only",













            "TDSCDMA/WCDMA",













            "LTE/TDSCDMA",













            "TDSCDMA/GSM",













            "LTE/TDSCDMA/GSM",













            "TDSCDMA/GSM/WCDMA",













            "LTE/TDSCDMA/WCDMA",













            "LTE/TDSCDMA/GSM/WCDMA",













            "TDSCDMA/CDMA/EvDo/GSM/WCDMA ",













            "LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA",













            "NR only",













            "NR/LTE",













            "NR/LTE/CDME/EvDo",













            "NR/LTE/GSM/WCDMA",













            "NR/LTE/CDMA/EvDo/GSM/WCDMA",













            "NR/LTE/WCDMA",













            "NR/LTE/TDSCDMA",













            "NR/LTE/TDSCDMA/GSM",













            "NR/LTE/TDSCDMA/WCDMA",













            "NR/LTE/TDSCDMA/GSM/WCDMA",













            "NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA",















            "Unknown"















    };