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

am 386278a3: CDMA Settings additions

Browse Source 
Merge commit '386278a338d740dce95b7fa1514662b0eb5683e4'

* commit '386278a338d740dce95b7fa1514662b0eb5683e4':
  CDMA Settings additions
This commit is contained in:
Chouting Zhang
2009-06-25 22:06:36 -07:00
committed by The Android Open Source Project
parent 65e761f144 386278a338
commit 620965ccc5
7 changed files with 115 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/SecuritySettings.java
View File

@@ -41,6 +41,7 @@ import android.text.method.LinkMovementMethod;
import android.widget.TextView;
import com.android.internal.widget.LockPatternUtils;
import android.telephony.TelephonyManager;
import java.util.Observable;
import java.util.Observer;
@@ -169,18 +170,24 @@ public class SecuritySettings extends PreferenceActivity implements
mChoosePattern.setIntent(intent);
inlinePrefCat.addPreference(mChoosePattern);
PreferenceScreen simLockPreferences = getPreferenceManager()
.createPreferenceScreen(this);
simLockPreferences.setTitle(R.string.sim_lock_settings_category);
// Intent to launch SIM lock settings
intent = new Intent();
intent.setClassName("com.android.settings", "com.android.settings.IccLockSettings");
simLockPreferences.setIntent(intent);
int activePhoneType = TelephonyManager.getDefault().getPhoneType();
// do not display SIM lock for CDMA phone
if (TelephonyManager.PHONE_TYPE_CDMA != activePhoneType)
{
PreferenceScreen simLockPreferences = getPreferenceManager()
.createPreferenceScreen(this);
simLockPreferences.setTitle(R.string.sim_lock_settings_category);
// Intent to launch SIM lock settings
intent = new Intent();
intent.setClassName("com.android.settings", "com.android.settings.IccLockSettings");
simLockPreferences.setIntent(intent);
PreferenceCategory simLockCat = new PreferenceCategory(this);
simLockCat.setTitle(R.string.sim_lock_settings_title);
root.addPreference(simLockCat);
simLockCat.addPreference(simLockPreferences);
PreferenceCategory simLockCat = new PreferenceCategory(this);
simLockCat.setTitle(R.string.sim_lock_settings_title);
root.addPreference(simLockCat);
simLockCat.addPreference(simLockPreferences);
}
// Passwords
PreferenceCategory passwordsCat = new PreferenceCategory(this);