Revert "Split TeleService into a client apk and a lib."
This reverts commit 14e676a84b9adf52f2d0660b93a53afdb7edcb0f.
Reason for revert: b/146034680 - cause is that resource overlays are not working.
Bug: 146034680
Bug: 144806641
Merged-in: Iaf897c2b38c92b1c9be74c9705520f462d58785b
Change-Id: I3fb9d6f3ee68b6e4637e7fb602afd30a99b2f5af
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9968bf..e6dd4f9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,10 +16,22 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Official label of the phone app, as seen in "Manage Applications"
+ and other settings UIs. This is the version of the label for
+ tablet devices, where the phone app handles mobile data but not
+ actual phone calls. -->
+ <string name="phoneAppLabel" product="tablet">Mobile Data</string>
+
+ <!-- Official label of the phone app, as seen in "Manage Applications"
+ and other settings UIs. -->
+ <string name="phoneAppLabel" product="default">Phone Services</string>
+
<!-- Screen title for Emergency Dialer UI -->
<string name="emergencyDialerIconLabel">Emergency Dialer</string>
<!-- Activity label for the in-call UI -->
<string name="phoneIconLabel">Phone</string>
+ <!-- Title of FDN list screen -->
+ <string name="fdnListLabel">FDN list</string>
<!-- Call status -->
<!-- Incoming call screen, name of "unknown" caller -->
@@ -608,6 +620,9 @@
<!-- USSD aggregation dialog box: separator strings between messages (new-lines will be added before and after) -->
<string name="ussd_dialog_sep" translatable="false">----------</string>
+ <string name="gsm_umts_options">GSM/UMTS Options</string>
+ <string name="cdma_options">CDMA Options</string>
+
<!-- Screen option on the mobile network settings to go into data usage settings -->
<string name="throttle_data_usage">Data usage</string>
<!-- Data usage settings screen option for checking the current usage -->
@@ -977,6 +992,8 @@
<string name="simContacts_emptyLoading">Reading from SIM card\u2026</string>
<!-- Call settings, string that appears on FDN contact list when there are no contacts on the SIM. -->
<string name="simContacts_empty">No contacts on your SIM card.</string>
+ <!-- Call settings: title of the dialog that lets you select contacts from the SIM. -->
+ <string name="simContacts_title">Select contacts to import</string>
<!-- Appears when user tries to import contacts in SIM during airplane mode [CHAR LIMIT=NONE] -->
<string name="simContacts_airplaneMode">Turn off airplane mode to import contacts from the SIM card.</string>
