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

Move iccid number to sim status dialog

Browse Source 
- Remove iccid number logic from imei dialog
 - Add iccid number log to sim status dialog

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I087688645169b387b9d65264e2c8b70ca565a44e
This commit is contained in:
jeffreyhuang
2017-11-06 12:38:45 -08:00
parent d723394569
commit 5b8202a296
6 changed files with 80 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
View File

@@ -44,10 +44,6 @@ public class ImeiInfoDialogController {
@VisibleForTesting
static final int ID_MEID_NUMBER_VALUE = R.id.meid_number_value;
@VisibleForTesting
static final int ID_ICC_ID_LABEL = R.id.icc_id_label;
@VisibleForTesting
static final int ID_ICC_ID_VALUE = R.id.icc_id_value;
@VisibleForTesting
static final int ID_IMEI_VALUE = R.id.imei_value;
@VisibleForTesting
static final int ID_IMEI_SV_VALUE = R.id.imei_sv_value;
@@ -108,8 +104,7 @@ public class ImeiInfoDialogController {
mDialog.setText(ID_PRL_VERSION_VALUE, getCdmaPrlVersion());
if (isCdmaLteEnabled()) {
// Show ICC ID and IMEI for LTE device
mDialog.setText(ID_ICC_ID_VALUE, mSubscriptionInfo.getIccId());
// Show IMEI for LTE device
mDialog.setText(ID_IMEI_VALUE,
getTextAsDigits(mTelephonyManager.getImei(mSlotId)));
mDialog.setText(ID_IMEI_SV_VALUE,
@@ -117,8 +112,6 @@ public class ImeiInfoDialogController {
} else {
// device is not GSM/UMTS, do not display GSM/UMTS features
mDialog.removeViewFromScreen(ID_GSM_SETTINGS);
mDialog.removeViewFromScreen(ID_ICC_ID_LABEL);
mDialog.removeViewFromScreen(ID_ICC_ID_VALUE);
}
}
@@ -128,8 +121,6 @@ public class ImeiInfoDialogController {
getTextAsDigits(mTelephonyManager.getDeviceSoftwareVersion(mSlotId)));
// device is not CDMA, do not display CDMA features
mDialog.removeViewFromScreen(ID_CDMA_SETTINGS);
mDialog.removeViewFromScreen(ID_ICC_ID_LABEL);
mDialog.removeViewFromScreen(ID_ICC_ID_VALUE);
}
private SubscriptionInfo getSubscriptionInfo(Context context, int slotId) {