am 95364e4a: Allow alternate string to be used for min_number

* commit '95364e4af3cb09bff58baab6fa4a6a2218e7fc94':
  Allow alternate string to be used for min_number
This commit is contained in:
sy310.choi
2011-05-26 13:47:20 -07:00
committed by Android Git Automerger
3 changed files with 9 additions and 0 deletions

View File

@@ -17,4 +17,8 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="additional_system_update" translatable="false"></string> <string name="additional_system_update" translatable="false"></string>
<string name="additional_system_update_menu" translatable="false"></string> <string name="additional_system_update_menu" translatable="false"></string>
<!-- If false, MIN is displayed. If true, MSID is displayed. -->
<bool name="config_msid_enable" translatable="false">false</bool>
</resources> </resources>

View File

@@ -1257,6 +1257,8 @@
<string name="status_number">My phone number</string> <string name="status_number">My phone number</string>
<!-- About phone, status item title. The phone MIN number of the current device.--> <!-- About phone, status item title. The phone MIN number of the current device.-->
<string name="status_min_number">MIN</string> <string name="status_min_number">MIN</string>
<!-- About phone, status item title. The phone MSID number of the current device.-->
<string name="status_msid_number">MSID</string>
<!-- About phone, status item title. The phone PRL Version of the current device.--> <!-- About phone, status item title. The phone PRL Version of the current device.-->
<string name="status_prl_version">PRL Version</string> <string name="status_prl_version">PRL Version</string>
<!-- About phone, status item title. The phone MEID number of the current device.--> <!-- About phone, status item title. The phone MEID number of the current device.-->

View File

@@ -191,6 +191,9 @@ public class Status extends PreferenceActivity {
if (mPhone.getPhoneName().equals("CDMA")) { if (mPhone.getPhoneName().equals("CDMA")) {
setSummaryText("meid_number", mPhone.getMeid()); setSummaryText("meid_number", mPhone.getMeid());
setSummaryText("min_number", mPhone.getCdmaMin()); setSummaryText("min_number", mPhone.getCdmaMin());
if (getResources().getBoolean(R.bool.config_msid_enable)) {
findPreference("min_number").setTitle(R.string.status_msid_number);
}
setSummaryText("prl_version", mPhone.getCdmaPrlVersion()); setSummaryText("prl_version", mPhone.getCdmaPrlVersion());
// device is not GSM/UMTS, do not display GSM/UMTS features // device is not GSM/UMTS, do not display GSM/UMTS features