commit 5ee06359237aa789d0bd9a9a1fb57fd1555015a7
author Chouting Zhang <MichaelZhang@motorola.com> Wed Jul 22 22:51:40 2009 -0500
committer Wink Saville <wink@google.com> Tue Aug 04 10:20:32 2009 -0700
tree 7c1fc4d6bb9002c78d9bee864f7650bc2d0d307c
parent caf7d199e8f74466c41310d1253e5df1eb2a43d6

Remove 'SIM Card Lock' from Security & Location settings for CDMA phones.

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ed9cc48..ad91424 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -489,6 +489,8 @@
     <string name="security_settings_title">Security &amp; location</string>
     <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
     <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
+    <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
+    <string name="cdma_security_settings_summary">Set My Location, screen unlock, credential storage lock</string>
     <!-- In the security screen, the header title for settings related to  Passwords-->
     <string name="security_passwords_title">Passwords</string>
 

res/xml/settings.xml

diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 4e2177e..b7b5fb8 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -70,7 +70,8 @@
         <com.android.settings.IconPreferenceScreen
             settings:icon="@drawable/ic_settings_security"
             android:title="@string/security_settings_title"
-            android:summary="@string/security_settings_summary">
+            android:summary="@string/security_settings_summary"
+            android:key="security_settings">
             <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 4f888ff..d44800d 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -20,6 +20,7 @@
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.provider.Settings.System;
+import android.telephony.TelephonyManager;
 
 public class Settings extends PreferenceActivity {
 
@@ -34,6 +35,17 @@
         
         addPreferencesFromResource(R.xml.settings);
         
+        int activePhoneType = TelephonyManager.getDefault().getPhoneType();
+
+        // do not display SIM lock for CDMA phone
+        if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
+            findPreference("security_settings").setSummary(
+                    R.string.cdma_security_settings_summary);
+        } else {
+            findPreference("security_settings").setSummary(
+                    R.string.security_settings_summary);
+        }
+
         PreferenceGroup parent = (PreferenceGroup) findPreference(KEY_PARENT);
         Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SYNC_SETTINGS, 0);
         Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SEARCH_SETTINGS, 0);