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

am 41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev

Browse Source 
* commit '41c2962552b750a8e5fa07f283ba2b72b36d2298':
  Remove extraneous SIM status information
This commit is contained in:
PauloftheWest
2014-12-02 17:56:08 +00:00
committed by Android Git Automerger
parent a2caf6332f 41c2962552
commit 21316f1d1a
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -5540,8 +5540,6 @@
<string name="sim_no_inserted_msg">No SIM cards inserted</string> <string name="sim_no_inserted_msg">No SIM cards inserted</string>
<!-- SIM status title [CHAR LIMIT=40] --> <!-- SIM status title [CHAR LIMIT=40] -->
<string name="sim_status_title">SIM status</string> <string name="sim_status_title">SIM status</string>
<!-- SIM status summary [CHAR LIMIT=60] -->
<string name="sim_status_summary">SIM related information</string>
<!-- Title for call back. [CHAR LIMIT=60] --> <!-- Title for call back. [CHAR LIMIT=60] -->
<string name="sim_call_back_title">Call back from default SIM</string> <string name="sim_call_back_title">Call back from default SIM</string>
<!-- Title for outgoing back. [CHAR LIMIT=60] --> <!-- Title for outgoing back. [CHAR LIMIT=60] -->
@@ -5973,8 +5971,6 @@
<!-- Title and summary for SIM Status --> <!-- Title and summary for SIM Status -->
<!-- Title for IMEI preference [CHAR LIMIT=30] --> <!-- Title for IMEI preference [CHAR LIMIT=30] -->
<string name="imei_information_title">IMEI information</string> <string name="imei_information_title">IMEI information</string>
<!-- Description for IMEI preference [CHAR LIMIT=40] -->
<string name="imei_information_summary">IMEI relative information</string>
<!-- Encryption interstitial title [CHAR LIMIT=30] --> <!-- Encryption interstitial title [CHAR LIMIT=30] -->
<string name="encryption_interstitial_header">Encryption</string> <string name="encryption_interstitial_header">Encryption</string>

2
res/xml/device_info_status.xml
View File

@@ -29,14 +29,12 @@
android:persistent="false" /> android:persistent="false" />
<PreferenceScreen android:key="sim_status" <PreferenceScreen android:key="sim_status"
android:title="@string/sim_status_title" android:title="@string/sim_status_title"
android:summary="@string/sim_status_summary"
android:persistent="false"> android:persistent="false">
<intent android:targetPackage="com.android.settings" <intent android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.deviceinfo.SimStatus" /> android:targetClass="com.android.settings.deviceinfo.SimStatus" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen android:key="imei_info" <PreferenceScreen android:key="imei_info"
android:title="@string/imei_information_title" android:title="@string/imei_information_title"
android:summary="@string/imei_information_summary"
android:persistent="false"> android:persistent="false">
<intent android:targetPackage="com.android.settings" <intent android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.deviceinfo.ImeiInformation" /> android:targetClass="com.android.settings.deviceinfo.ImeiInformation" />