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

Merge "Combine 5G and recommended strings" into sc-dev am: f1ee6987e6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233637

Change-Id: I979e3a78742eeca8405e4cb5be1bc7f0fe8cad3c
This commit is contained in:
Jeremy Goldman
2021-04-27 09:43:09 +00:00
committed by Automerger Merge Worker
parent a62dfa6e8c f1ee6987e6
commit a9b19776f8
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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:
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 {