Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev

        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

        android:title="@string/sim_lock_settings">

    <CheckBoxPreference

    <SwitchPreference

            android:key="sim_toggle"

            android:title="@string/sim_pin_toggle"

            android:summaryOn="@string/sim_lock_on"

import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.preference.CheckBoxPreference;

import android.preference.Preference;

import android.preference.PreferenceActivity;

import android.preference.PreferenceScreen;

import android.preference.SwitchPreference;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

    private Phone mPhone;

    private EditPinPreference mPinDialog;

    private CheckBoxPreference mPinToggle;

    private SwitchPreference mPinToggle;

    private Resources mRes;

        addPreferencesFromResource(R.xml.sim_lock_settings);

        mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG);

        mPinToggle = (CheckBoxPreference) findPreference(PIN_TOGGLE);

        mPinToggle = (SwitchPreference) findPreference(PIN_TOGGLE);

        if (savedInstanceState != null && savedInstanceState.containsKey(DIALOG_STATE)) {

            mDialogState = savedInstanceState.getInt(DIALOG_STATE);

            mPin = savedInstanceState.getString(DIALOG_PIN);