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

Commit def04b9c authored by Jeremy Goldman's avatar Jeremy Goldman
Browse files

Combine 5G and recommended strings 

for RTL languages, the 5G string should actually go to the right of the
"(recommended)" string. Because concatenating these two strings is
difficult to control programatically, this change combines the two
strings into one so that translators can place each string in the
correct location accordingly.

Bug: 185245370
Screenshot: https://screenshot.googleplex.com/8tn6qdvK2iGzvUv (looks
identical to before in english)
Test: atest -c SettingsUnitTest

Change-Id: I3511306a76ba9a0e6d30b62a6c7eb79f991a0262
parent 1812aabc

res/values/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -12304,10 +12304,8 @@ 
    <!-- 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 mode 5g recommended [CHAR LIMIT=NONE] -->









    <string name="network_5G_recommended">5G (recommended)</string>









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









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









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

























src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java



+6
−14






























Original line number
Diff line number
Diff line







@@ -586,9 +586,7 @@ public class EnabledNetworkModePreferenceController extends







                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:









                    setSelectedEntry(









                            TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);









                    setSummary(getResourcesForSubId().getString(R.string.network_5G)









                            + getResourcesForSubId().getString(









                            R.string.network_recommended));









                    setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));









                    break;









                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:









                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:








@@ -597,15 +595,11 @@ public class EnabledNetworkModePreferenceController extends







                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:









                    setSelectedEntry(TelephonyManagerConstants









                            .NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);









                    setSummary(getResourcesForSubId().getString(R.string.network_5G)









                            + getResourcesForSubId().getString(









                            R.string.network_recommended));









                    setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));









                    break;









                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:









                    setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO);









                    setSummary(getResourcesForSubId().getString(R.string.network_5G)









                            + getResourcesForSubId().getString(









                            R.string.network_recommended));









                    setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));









                    break;









                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:









                    setSelectedEntry(








@@ -615,9 +609,8 @@ public class EnabledNetworkModePreferenceController extends







                            || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {









                        setSummary(R.string.network_global);









                    } else {









                        setSummary(getResourcesForSubId().getString(R.string.network_5G)









                                + getResourcesForSubId().getString(









                                R.string.network_recommended));









                        setSummary(getResourcesForSubId().getString(









                                R.string.network_5G_recommended));









                    }









                    break;









                default:








@@ -709,8 +702,7 @@ public class EnabledNetworkModePreferenceController extends







        private void add5gEntry(int value) {









            boolean isNRValue = value >= TelephonyManagerConstants.NETWORK_MODE_NR_ONLY;









            if (showNrList() && isNRValue) {









                mEntries.add(getResourcesForSubId().getString(R.string.network_5G)









                        + getResourcesForSubId().getString(R.string.network_recommended));









                mEntries.add(getResourcesForSubId().getString(R.string.network_5G_recommended));









                mEntriesValue.add(value);









                mIs5gEntryDisplayed = true;









            } else {