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

Merge \\\"Update UI for gesture settings.\\\" into nyc-mr1-dev am: a2b693db93 am: bbe8025d14

Browse Source 
am: e8c50127db

Change-Id: Ifc21b65602f71a44ad83ea3a0092c1e89de49bdd
This commit is contained in:
Doris Ling
2016-07-29 16:47:55 +00:00
committed by android-build-merger
parent 869c577026 e8c50127db
commit 9dbd4b0de0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,15 +80,16 @@ public class ImeiInformation extends SettingsPreferenceFragment {
} }
setSummaryText(KEY_PRL_VERSION, phone.getCdmaPrlVersion()); setSummaryText(KEY_PRL_VERSION, phone.getCdmaPrlVersion());
removePreferenceFromScreen(KEY_IMEI_SV);
if (phone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) { if (phone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) {
// Show ICC ID and IMEI for LTE device // Show ICC ID and IMEI for LTE device
setSummaryText(KEY_ICC_ID, phone.getIccSerialNumber()); setSummaryText(KEY_ICC_ID, phone.getIccSerialNumber());
setSummaryTextAsDigit(KEY_IMEI, phone.getImei()); setSummaryTextAsDigit(KEY_IMEI, phone.getImei());
setSummaryTextAsDigit(KEY_IMEI_SV, phone.getDeviceSvn());
} else { } else {
// device is not GSM/UMTS, do not display GSM/UMTS features // device is not GSM/UMTS, do not display GSM/UMTS features
// check Null in case no specified preference in overlay xml // check Null in case no specified preference in overlay xml
removePreferenceFromScreen(KEY_IMEI_SV);
removePreferenceFromScreen(KEY_IMEI); removePreferenceFromScreen(KEY_IMEI);
removePreferenceFromScreen(KEY_ICC_ID); removePreferenceFromScreen(KEY_ICC_ID);
} }