Merge "Workaround to hide LTE wording for O2" into pi-dev
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 6e0d4f8..f128f9a 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -1181,10 +1181,17 @@
.getStringArray(R.array.enhanced_4g_lte_mode_title_variant);
// Default index 0 indicates the default title string
CharSequence enhanced4glteModeTitle = variantTitles[0];
+ CharSequence enhanced4glteModeSummary = getContext().getResources()
+ .getString(R.string.enhanced_4g_lte_mode_summary);
if (variant4glteTitleIndex >= 0 && variant4glteTitleIndex < variantTitles.length) {
enhanced4glteModeTitle = variantTitles[variant4glteTitleIndex];
+ // Workaround for b/119068616, O2 persists to replace LTE with 4G or hide it.
+ if (variant4glteTitleIndex == 2) {
+ enhanced4glteModeSummary = null;
+ }
}
mButton4glte.setTitle(enhanced4glteModeTitle);
+ mButton4glte.setSummary(enhanced4glteModeSummary);
mLteDataServicePref.setEnabled(hasActiveSubscriptions);
Preference ps;
ps = findPreference(BUTTON_CELL_BROADCAST_SETTINGS);