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

Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: fcfb72f8fc am: ffda9f5903

Browse Source 
Change-Id: I22cadc5ef99d405ecf3bf5f43d4cae871e7c7ba3
This commit is contained in:
Bonian Chen
2020-05-07 17:05:14 +00:00
committed by Automerger Merge Worker
parent 58e213e828 ffda9f5903
commit 6fcba23f84
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,10 +413,10 @@ public class EnabledNetworkModePreferenceController extends
TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
if (is5gEntryDisplayed()) { if (is5gEntryDisplayed()) {
setSummary(mShow4gForLTE setSummary(mShow4gForLTE
? R.string.network_4G_pure : R.string.network_lte_pure); ? R.string.network_4G_pure : R.string.network_lte_pure);
} else { } else {
setSummary(mShow4gForLTE setSummary(mShow4gForLTE
? R.string.network_4G : R.string.network_lte); ? R.string.network_4G : R.string.network_lte);
} }
} else { } else {
setSelectedEntry( setSelectedEntry(
@@ -461,8 +461,8 @@ public class EnabledNetworkModePreferenceController extends
case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) { if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {
setSelectedEntry( setSelectedEntry(TelephonyManagerConstants
TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA); .NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
setSummary(is5gEntryDisplayed() setSummary(is5gEntryDisplayed()
? R.string.network_lte_pure : R.string.network_lte); ? R.string.network_lte_pure : R.string.network_lte);
} else { } else {
@@ -498,8 +498,8 @@ public class EnabledNetworkModePreferenceController extends
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
setSelectedEntry( setSelectedEntry(TelephonyManagerConstants
TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA); .NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
setSummary(mContext.getString(R.string.network_5G) setSummary(mContext.getString(R.string.network_5G)
+ mContext.getString(R.string.network_recommended)); + mContext.getString(R.string.network_recommended));
break; break;
@@ -553,7 +553,8 @@ public class EnabledNetworkModePreferenceController extends
case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA; return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA;
case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA; return TelephonyManagerConstants
.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
default: default:
return networkType; // not LTE return networkType; // not LTE
} }
@@ -654,7 +655,7 @@ public class EnabledNetworkModePreferenceController extends
} }
private String[] getEntryValues() { private String[] getEntryValues() {
Integer intArr[] = mEntriesValue.toArray(new Integer[0]); final Integer [] intArr = mEntriesValue.toArray(new Integer[0]);
return Arrays.stream(intArr) return Arrays.stream(intArr)
.map(String::valueOf) .map(String::valueOf)
.toArray(String[]::new); .toArray(String[]::new);