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

Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev

Browse Source
This commit is contained in:
PauloftheWest
2014-12-19 22:53:03 +00:00
committed by Android (Google) Code Review
parent 19627ca215 a68bdb6dbe
commit 3e864c0bda
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/deviceinfo/ImeiInformation.java
View File

@@ -43,6 +43,7 @@ public class ImeiInformation extends PreferenceActivity {
private static final String KEY_IMEI_SV = "imei_sv"; private static final String KEY_IMEI_SV = "imei_sv";
private SubscriptionManager mSubscriptionManager; private SubscriptionManager mSubscriptionManager;
private boolean isMultiSIM = false;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -56,6 +57,7 @@ public class ImeiInformation extends PreferenceActivity {
// Since there are multiple phone for dsds, therefore need to show information for different // Since there are multiple phone for dsds, therefore need to show information for different
// phones. // phones.
private void initPreferenceScreen(int slotCount) { private void initPreferenceScreen(int slotCount) {
isMultiSIM = (slotCount > 1);
for (int slotId = 0; slotId < slotCount; slotId ++) { for (int slotId = 0; slotId < slotCount; slotId ++) {
addPreferencesFromResource(R.xml.device_info_phone_status); addPreferencesFromResource(R.xml.device_info_phone_status);
setPreferenceValue(slotId); setPreferenceValue(slotId);
@@ -122,8 +124,10 @@ public class ImeiInformation extends PreferenceActivity {
private void updateTitle(Preference pref, int slotId) { private void updateTitle(Preference pref, int slotId) {
if (pref != null) { if (pref != null) {
String title = pref.getTitle().toString(); String title = pref.getTitle().toString();
// Slot starts from 1, slotId starts from 0 so plus 1 if (isMultiSIM) {
title = title + getResources().getString(R.string.slot_number, slotId + 1); // Slot starts from 1, slotId starts from 0 so plus 1
title += " " + getResources().getString(R.string.slot_number, slotId + 1);
}
pref.setTitle(title); pref.setTitle(title);
} }
} }