resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp

Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
2011-06-06 16:29:34 -07:00
parent cfe26919ab 531bed610c
commit 079e30cd2a
3 changed files with 27 additions and 0 deletions
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -227,6 +227,9 @@ public class Status extends PreferenceActivity {
            if (mPhone.getPhoneName().equals("CDMA")) {
                setSummaryText(KEY_MEID_NUMBER, mPhone.getMeid());
                setSummaryText(KEY_MIN_NUMBER, mPhone.getCdmaMin());
+                if (getResources().getBoolean(R.bool.config_msid_enable)) {
+                    findPreference(KEY_MIN_NUMBER).setTitle(R.string.status_msid_number);
+                }
                setSummaryText(KEY_PRL_VERSION, mPhone.getCdmaPrlVersion());

                // device is not GSM/UMTS, do not display GSM/UMTS features