diff --git a/res/values/strings.xml b/res/values/strings.xml index 74cf13d5757..85c653e6a21 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2965,7 +2965,7 @@ 1440p QHD+ - Full resolution uses more of your battery. Switching to full resolution may cause some apps to restart. + Full resolution uses more of your battery. Switching your resolution may cause some apps to restart. Colors diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java index fb384d4713e..825cb09ba53 100644 --- a/src/com/android/settings/network/SubscriptionsPreferenceController.java +++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java @@ -274,8 +274,12 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl String result = mSubsPrefCtrlInjector.getNetworkType( mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive); if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || isCarrierNetworkActive) { - result = mContext.getString(R.string.preference_summary_default_combination, - mContext.getString(R.string.mobile_data_connection_active), result); + if (result.isEmpty()) { + result = mContext.getString(R.string.mobile_data_connection_active); + } else { + result = mContext.getString(R.string.preference_summary_default_combination, + mContext.getString(R.string.mobile_data_connection_active), result); + } } else if (!isDataInService) { result = mContext.getString(R.string.mobile_data_no_connection); }