PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 079e30cd: resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp

Browse Source 
* commit '079e30cd2a09388ba9ad2149a66de86be4f3a7ac':
  Allow alternate string to be used for min_number
This commit is contained in:
Marco Nelissen
2011-06-07 11:15:26 -07:00
committed by Android Git Automerger
parent 19a5d81ed4 079e30cd2a
commit adcbf72c80
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/deviceinfo/Status.java
View File

@@ -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