PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine 5G and recommended strings

Browse Source 
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
This commit is contained in:
Jeremy Goldman
2021-04-20 14:27:56 +08:00
parent 1812aabcec
commit def04b9cef
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -12304,10 +12304,8 @@
<!-- NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] --> <!-- 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> <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] --> <!-- Text for Network mode 5g recommended [CHAR LIMIT=NONE] -->
<string name="network_recommended">\u0020(recommended)</string> <string name="network_5G_recommended">5G (recommended)</string>
<!-- Text for Network 5g [CHAR LIMIT=NONE] -->
<string name="network_5G" translatable="false">5G</string>
<!-- Text for Network lte [CHAR LIMIT=NONE] --> <!-- Text for Network lte [CHAR LIMIT=NONE] -->
<string name="network_lte_pure" translatable="false">LTE</string> <string name="network_lte_pure" translatable="false">LTE</string>
<!-- Text for Network 4g [CHAR LIMIT=NONE] --> <!-- Text for Network 4g [CHAR LIMIT=NONE] -->

20
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -586,9 +586,7 @@ public class EnabledNetworkModePreferenceController extends
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
setSelectedEntry( setSelectedEntry(
TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
setSummary(getResourcesForSubId().getString(R.string.network_5G) setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));
+ getResourcesForSubId().getString(
R.string.network_recommended));
break; break;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM: 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: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
setSelectedEntry(TelephonyManagerConstants setSelectedEntry(TelephonyManagerConstants
.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA); .NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
setSummary(getResourcesForSubId().getString(R.string.network_5G) setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));
+ getResourcesForSubId().getString(
R.string.network_recommended));
break; break;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:
setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO); setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO);
setSummary(getResourcesForSubId().getString(R.string.network_5G) setSummary(getResourcesForSubId().getString(R.string.network_5G_recommended));
+ getResourcesForSubId().getString(
R.string.network_recommended));
break; break;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
setSelectedEntry( setSelectedEntry(
@@ -615,9 +609,8 @@ public class EnabledNetworkModePreferenceController extends
|| MobileNetworkUtils.isWorldMode(mContext, mSubId)) { || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
setSummary(R.string.network_global); setSummary(R.string.network_global);
} else { } else {
setSummary(getResourcesForSubId().getString(R.string.network_5G) setSummary(getResourcesForSubId().getString(
+ getResourcesForSubId().getString( R.string.network_5G_recommended));
R.string.network_recommended));
} }
break; break;
default: default:
@@ -709,8 +702,7 @@ public class EnabledNetworkModePreferenceController extends
private void add5gEntry(int value) { private void add5gEntry(int value) {
boolean isNRValue = value >= TelephonyManagerConstants.NETWORK_MODE_NR_ONLY; boolean isNRValue = value >= TelephonyManagerConstants.NETWORK_MODE_NR_ONLY;
if (showNrList() && isNRValue) { if (showNrList() && isNRValue) {
mEntries.add(getResourcesForSubId().getString(R.string.network_5G) mEntries.add(getResourcesForSubId().getString(R.string.network_5G_recommended));
+ getResourcesForSubId().getString(R.string.network_recommended));
mEntriesValue.add(value); mEntriesValue.add(value);
mIs5gEntryDisplayed = true; mIs5gEntryDisplayed = true;
} else { } else {