diff --git a/res/values/strings.xml b/res/values/strings.xml index d20392dff1a..470c0824d56 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12304,10 +12304,8 @@ Preferred network mode: NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA - - \u0020(recommended) - - 5G + + 5G (recommended) LTE diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index f0d4a431c0b..6952e7237f3 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -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 {