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

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

Browse Source 
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
This commit is contained in:
Marco Nelissen
2011-06-06 16:29:34 -07:00
parent cfe26919ab 531bed610c
commit 079e30cd2a
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/values/config.xml Executable file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- If false, MIN is displayed. If true, MSID is displayed. -->
<bool name="config_msid_enable" translatable="false">false</bool>
</resources>

2
res/values/strings.xml
View File

@@ -1546,6 +1546,8 @@
<string name="status_number" product="default">My phone number</string> <string name="status_number" product="default">My phone number</string>
<!-- About phone, status item title. The phone MIN number of the current device.--> <!-- About phone, status item title. The phone MIN number of the current device.-->
<string name="status_min_number">MIN</string> <string name="status_min_number">MIN</string>
<!-- About phone, status item title. The phone MSID number of the current device.-->
<string name="status_msid_number">MSID</string>
<!-- About phone, status item title. The phone PRL Version of the current device.--> <!-- About phone, status item title. The phone PRL Version of the current device.-->
<string name="status_prl_version">PRL Version</string> <string name="status_prl_version">PRL Version</string>
<!-- About phone, status item title. The phone IMEI/MEID number of the current LTE/CDMA device.--> <!-- About phone, status item title. The phone IMEI/MEID number of the current LTE/CDMA device.-->

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

@@ -227,6 +227,9 @@ public class Status extends PreferenceActivity {
if (mPhone.getPhoneName().equals("CDMA")) { if (mPhone.getPhoneName().equals("CDMA")) {
setSummaryText(KEY_MEID_NUMBER, mPhone.getMeid()); setSummaryText(KEY_MEID_NUMBER, mPhone.getMeid());
setSummaryText(KEY_MIN_NUMBER, mPhone.getCdmaMin()); 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()); setSummaryText(KEY_PRL_VERSION, mPhone.getCdmaPrlVersion());
// device is not GSM/UMTS, do not display GSM/UMTS features // device is not GSM/UMTS, do not display GSM/UMTS features