Move WFC strings to framework/base
Change-Id: I3667fbe705f5c395554b9a82ec4dfa18e604d8fc
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1e5d785..54bbb91 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -148,8 +148,6 @@
<!-- Title for setting to select Wi-Fi call manager account -->
<string name="wifi_calling">Wi-Fi calling</string>
- <!-- Summary label for wi-fi calling when it is turned off. [CHAR LIMIT=NONE] -->
- <string name="wifi_calling_off_summary">Off</string>
<!-- Indication for option to not use a Wi-Fi call manager -->
<string name="wifi_calling_do_not_use">Do not use Wi-Fi calling</string>
<!-- Indication for option to not use a call assistant. -->
@@ -430,13 +428,6 @@
<!-- Cellular network 4G summary [CHAR LIMIT=80] -->
<string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice and other communications (recommended)</string>
- <!-- WFC, summary for Wi-Fi Preferred [CHAR LIMIT=100] -->
- <string name="wfc_mode_wifi_preferred_summary">Wi-Fi preferred (Uses cell network only if Wi-Fi isn\'t available)</string>
- <!-- WFC, summary for Cellular Preferred [CHAR LIMIT=100] -->
- <string name="wfc_mode_cellular_preferred_summary">Cellular preferred (Uses Wi-Fi only if cell network isn\'t available)</string>
- <!-- WFC, summary for Wi-Fi Only [CHAR LIMIT=100] -->
- <string name="wfc_mode_wifi_only_summary">Wi-Fi only (Never uses cell network. Can\'t make or receive calls if Wi-Fi isn\'t available)</string>
-
<!-- Mobile network settings screen, data enabling checkbox name -->
<string name="data_enabled">Data enabled</string>
<!-- Mobile network settings screen, setting summary text when check box is not selected (explains what selecting it would do) [CHAR LIMITS=40] -->
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index ed600ee..c211323 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -1344,18 +1344,18 @@
if (!ImsManager.isWfcEnabledByPlatform(mPhone.getContext())) {
prefSet.removePreference(wifiCallingSettings);
} else {
- int resId = R.string.wifi_calling_off_summary;
+ int resId = com.android.internal.R.string.wifi_calling_off_summary;
if (ImsManager.isWfcEnabledByUser(mPhone.getContext())) {
int wfcMode = ImsManager.getWfcMode(mPhone.getContext());
switch (wfcMode) {
case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:
- resId = R.string.wfc_mode_wifi_only_summary;
+ resId = com.android.internal.R.string.wfc_mode_wifi_only_summary;
break;
case ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED:
- resId = R.string.wfc_mode_cellular_preferred_summary;
+ resId = com.android.internal.R.string.wfc_mode_cellular_preferred_summary;
break;
case ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED:
- resId = R.string.wfc_mode_wifi_preferred_summary;
+ resId = com.android.internal.R.string.wfc_mode_wifi_preferred_summary;
break;
default:
if (DBG) log("Unexpected WFC mode value: " + wfcMode);
