Use description instead of generated Slot ID string.
The TelecommAccountRegistry was ignoring the display name
that the user had previously given the Settings->SIM cards activity.
It was just using a string that was generated based on the
slot id. The fix required that we listen for a content change
intent along with using the description as needed. Note that
there is an issue (which I have filed as b/17405123). The siminfo
database seems to be regenerated on device boot.
Bug: 17390812
Change-Id: I646272add924bbe4e96e46bcf5891ed7e00e5287
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0282c76..b78876f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1218,4 +1218,8 @@
<!-- Label for close button in dialog, for video calling setting. -->
<string name="enable_video_calling_dialog_close">Close</string>
+ <!-- Strings used in Settings->Sim cards for each installed Sim. -->
+ <string name="sim_label_emergency_calls">Emergency calls</string>
+ <string name="sim_description_emergency_calls">Emergency calling only</string>
+ <string name="sim_description_default">SIM card in slot <xliff:g id="slot_id">%d</xliff:g></string>
</resources>