diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 17f1e54..72defac 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1896,6 +1896,20 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
+        <activity android:name="Settings$SimSettingsActivity"
+                android:label="@string/sim_settings_title"
+                android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.sim.SimSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/sim_settings" />
+        </activity>
+
         <provider
             android:name=".search.SettingsSearchIndexablesProvider"
             android:authorities="com.android.settings"
diff --git a/res/drawable-hdpi/ic_sim_sd.png b/res/drawable-hdpi/ic_sim_sd.png
new file mode 100644
index 0000000..50a16db
--- /dev/null
+++ b/res/drawable-hdpi/ic_sim_sd.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sim_sd.png b/res/drawable-mdpi/ic_sim_sd.png
new file mode 100644
index 0000000..1926608
--- /dev/null
+++ b/res/drawable-mdpi/ic_sim_sd.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sim_sd.png b/res/drawable-xhdpi/ic_sim_sd.png
new file mode 100644
index 0000000..1a0842b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sim_sd.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sim_sd.png b/res/drawable-xxhdpi/ic_sim_sd.png
new file mode 100644
index 0000000..e05e7ad
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sim_sd.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_sim_sd.png b/res/drawable-xxxhdpi/ic_sim_sd.png
new file mode 100644
index 0000000..b12e34e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_sim_sd.png
Binary files differ
diff --git a/res/layout/multi_sim_dialog.xml b/res/layout/multi_sim_dialog.xml
new file mode 100644
index 0000000..070b64e
--- /dev/null
+++ b/res/layout/multi_sim_dialog.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/sim_dialog_padding"
+            android:orientation="vertical">
+
+        <LinearLayout android:id="@+id/type"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/sim_dialog_margin_top"
+                    android:text="@string/sim_editor_name"
+                    style="?android:attr/textAppearanceMedium" />
+
+            <EditText android:id="@+id/sim_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:paddingBottom="@dimen/sim_dialog_margin_bottom"
+                    android:hint="@string/wifi_ssid_hint"
+                    android:inputType="textNoSuggestions"
+                    android:maxLength="@integer/sim_name_length" />
+
+        </LinearLayout>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/sim_dialog_margin_top"
+                    android:text="@string/sim_editor_carrier" />
+
+            <TextView android:id="@+id/carrier"
+                    android:textColor="@android:color/black"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/sim_dialog_margin_bottom"
+                    android:singleLine="true"
+                    style="?android:attr/textAppearanceMedium" />
+
+        </LinearLayout>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/sim_dialog_margin_top"
+                    android:text="@string/sim_editor_number" />
+
+            <TextView android:id="@+id/number"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="@dimen/sim_dialog_margin_bottom"
+                    android:singleLine="true"
+                    android:textColor="@android:color/black"
+                    style="?android:attr/textAppearanceMedium" />
+
+        </LinearLayout>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/sim_dialog_margin_top"
+                    android:text="@string/sim_editor_num_format" />
+
+            <Spinner android:id="@+id/display_numbers"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:entries="@array/sim_card_data_range"
+                    android:paddingBottom="@dimen/sim_dialog_margin_bottom"
+                    android:prompt="@string/sim_editor_num_format" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index eda676f..4d06c1c 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -192,4 +192,13 @@
     <!-- Screen pinning textview paddings -->
     <dimen name="screen_pinning_textview_padding">40dp</dimen>
 
+    <!-- SIM Dialog Margin top -->
+    <dimen name="sim_dialog_margin_top">8dip</dimen>
+    <!-- SIM Dialog Margin bottom -->
+    <dimen name="sim_dialog_margin_bottom">16dip</dimen>
+    <!-- SIM Dialog padding -->
+    <dimen name="sim_dialog_padding">8dip</dimen>
+    <!-- Sim Card Name length -->
+    <integer name="sim_name_length">32</integer>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 76fdafc..1298289 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5422,6 +5422,8 @@
     <string name="sim_setup_wizard_title">SIM cards</string>
     <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
     <string name="sim_settings_title">SIM cards</string>
+    <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+    <string name="sim_settings_summary"><xliff:g id="sim_name">%1$s</xliff:g> - <xliff:g id="sim_number">%2$s</xliff:g></string>
     <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
     <string name="sim_cards_changed_message">SIM cards have changed</string>
     <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
@@ -5436,6 +5438,8 @@
     <string name="sim_select_card">Select a SIM card</string>
     <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
     <string name="sim_card_number_title">SIM <xliff:g id="card_number">%1$d</xliff:g></string>
+    <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->
+    <string name="sim_slot_empty">SIM empty</string>
     <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
     <string name="sim_editor_name">SIM name</string>
     <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index 53a6d5a..01a4f83 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -38,6 +38,14 @@
                 android:icon="@drawable/ic_settings_bluetooth2"
                 />
 
+        <!-- SIM Cards -->
+        <dashboard-tile
+                android:id="@+id/sim_settings"
+                android:title="@string/sim_settings_title"
+                android:fragment="com.android.settings.sim.SimSettings"
+                android:icon="@drawable/ic_sim_sd"
+                />
+
         <!-- Data Usage -->
         <dashboard-tile
                 android:id="@+id/data_usage_settings"
diff --git a/res/xml/sim_settings.xml b/res/xml/sim_settings.xml
new file mode 100644
index 0000000..105be2e
--- /dev/null
+++ b/res/xml/sim_settings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/sim_settings_title">
+
+    <PreferenceCategory
+            android:key="sim_cards"
+            android:title="@string/sim_settings_title" />
+
+    <PreferenceCategory
+            android:key="sim_activities"
+            android:title="@string/sim_pref_divider">
+
+        <com.android.settings.notification.DropDownPreference
+            android:key="sim_cellular_data"
+            android:title="@string/cellular_data_title"
+            android:dialogTitle="@string/cellular_data_title" />
+
+        <com.android.settings.notification.DropDownPreference
+            android:key="sim_calls"
+            android:title="@string/calls_title" />
+
+        <com.android.settings.notification.DropDownPreference
+            android:key="sim_sms"
+            android:title="@string/sms_messages_title"
+            android:dialogTitle="@string/sms_messages_title" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 01149f3..fcaa7ae 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -28,6 +28,7 @@
     */
     public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WirelessSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class SimSettingsActivity extends SettingsActivity { /* empty */ }
     public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }
     public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DateTimeSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 90e8fd4..bd53eb6 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -100,6 +100,7 @@
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.sim.SimSettings;
 import com.android.settings.tts.TextToSpeechSettings;
 import com.android.settings.users.UserSettings;
 import com.android.settings.vpn2.VpnSettings;
@@ -204,6 +205,7 @@
             R.id.wifi_settings,
             R.id.bluetooth_settings,
             R.id.data_usage_settings,
+            R.id.sim_settings,
             R.id.wireless_settings,
             R.id.device_section,
             R.id.notification_settings,
@@ -234,6 +236,7 @@
             SavedAccessPointsWifiSettings.class.getName(),
             BluetoothSettings.class.getName(),
             MessageAccessSettings.class.getName(),
+            SimSettings.class.getName(),
             TetherSettings.class.getName(),
             WifiP2pSettings.class.getName(),
             VpnSettings.class.getName(),
@@ -1034,7 +1037,10 @@
                                 curBundle = null;
                             }
 
-                            category.addTile(tile);
+                            // Show the SIM Cards setting if there are more than 2 SIMs installed.
+                            if(tile.id != R.id.sim_settings || SimSettings.showSimCardScreen(this)){
+                                category.addTile(tile);
+                            }
 
                         } else {
                             XmlUtils.skipCurrentTag(parser);
diff --git a/src/com/android/settings/notification/DropDownPreference.java b/src/com/android/settings/notification/DropDownPreference.java
index 45c83a5..1d1b366 100644
--- a/src/com/android/settings/notification/DropDownPreference.java
+++ b/src/com/android/settings/notification/DropDownPreference.java
@@ -106,6 +106,11 @@
         mValues.add(value);
     }
 
+    public void clearItems(){
+        mAdapter.clear();
+        mValues.clear();
+    }
+
     @Override
     protected void onBindView(View view) {
         super.onBindView(view);
@@ -123,4 +128,4 @@
     public interface Callback {
         boolean onItemSelected(int pos, Object value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 96e057e..44717c1 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -41,6 +41,7 @@
 import com.android.settings.notification.OtherSoundSettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.sim.SimSettings;
 import com.android.settings.users.UserSettings;
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
@@ -55,24 +56,25 @@
 
     public static final int RANK_WIFI = 1;
     public static final int RANK_BT = 2;
-    public static final int RANK_DATA_USAGE = 3;
-    public static final int RANK_WIRELESS = 4;
-    public static final int RANK_HOME = 5;
-    public static final int RANK_DISPLAY = 6;
-    public static final int RANK_WALLPAPER = 7;
-    public static final int RANK_NOTIFICATIONS = 8;
-    public static final int RANK_MEMORY = 9;
-    public static final int RANK_POWER_USAGE = 10;
-    public static final int RANK_USERS = 11;
-    public static final int RANK_LOCATION = 12;
-    public static final int RANK_SECURITY = 13;
-    public static final int RANK_IME = 14;
-    public static final int RANK_PRIVACY = 15;
-    public static final int RANK_DATE_TIME = 16;
-    public static final int RANK_ACCESSIBILITY = 17;
-    public static final int RANK_PRINTING = 18;
-    public static final int RANK_DEVELOPEMENT = 19;
-    public static final int RANK_DEVICE_INFO = 20;
+    public static final int RANK_SIM = 3;
+    public static final int RANK_DATA_USAGE = 4;
+    public static final int RANK_WIRELESS = 5;
+    public static final int RANK_HOME = 6;
+    public static final int RANK_DISPLAY = 7;
+    public static final int RANK_WALLPAPER = 8;
+    public static final int RANK_NOTIFICATIONS = 9;
+    public static final int RANK_MEMORY = 10;
+    public static final int RANK_POWER_USAGE = 11;
+    public static final int RANK_USERS = 12;
+    public static final int RANK_LOCATION = 13;
+    public static final int RANK_SECURITY = 14;
+    public static final int RANK_IME = 15;
+    public static final int RANK_PRIVACY = 16;
+    public static final int RANK_DATE_TIME = 17;
+    public static final int RANK_ACCESSIBILITY = 18;
+    public static final int RANK_PRINTING = 19;
+    public static final int RANK_DEVELOPEMENT = 20;
+    public static final int RANK_DEVICE_INFO = 21;
 
     public static final int RANK_UNDEFINED = -1;
     public static final int RANK_OTHERS = 1024;
@@ -93,6 +95,9 @@
         sRankMap.put(BluetoothSettings.class.getName(), RANK_BT);
         sRankMap.put(MessageAccessSettings.class.getName(), RANK_BT);
 
+        // SIM Cards
+        sRankMap.put(SimSettings.class.getName(), RANK_SIM);
+
         // DataUsage
         sRankMap.put(DataUsageSummary.class.getName(), RANK_DATA_USAGE);
         sRankMap.put(DataUsageMeteredSettings.class.getName(), RANK_DATA_USAGE);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 4749733..a3d2b8d 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -44,6 +44,7 @@
 import com.android.settings.notification.OtherSoundSettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.sim.SimSettings;
 import com.android.settings.users.UserSettings;
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
@@ -88,6 +89,13 @@
                         BluetoothSettings.class.getName(),
                         R.drawable.ic_settings_bluetooth2));
 
+        sResMap.put(SimSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(SimSettings.class.getName()),
+                        R.xml.sim_settings,
+                        SimSettings.class.getName(),
+                        R.drawable.ic_sim_sd));
+
         sResMap.put(MessageAccessSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(MessageAccessSettings.class.getName()),
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
new file mode 100644
index 0000000..2e1c0f5
--- /dev/null
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -0,0 +1,373 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.settings.sim;
+
+import com.android.settings.R;
+
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
+import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telecomm.PhoneAccount;
+import android.telephony.CellInfo;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.TelephonyIntents;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.notification.DropDownPreference;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.Indexable.SearchIndexProvider;
+import com.android.settings.search.SearchIndexableRaw;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SimSettings extends RestrictedSettingsFragment implements Indexable {
+    private static final String TAG = "SimSettings";
+
+    private static final String DISALLOW_CONFIG_SIM = "no_config_sim";
+    private static final String SIM_CARD_CATEGORY = "sim_cards";
+    private static final String KEY_CELLULAR_DATA = "sim_cellular_data";
+    private static final String KEY_CALLS = "sim_calls";
+    private static final String KEY_SMS = "sim_sms";
+    private static final String KEY_ACTIVITIES = "activities";
+
+    /**
+     * By UX design we have use only one Subscription Information(SubInfo) record per SIM slot.
+     * mAvalableSubInfos is the list of SubInfos we present to the user.
+     * mSubInfoList is the list of all SubInfos.
+     */
+    private List<SubInfoRecord> mAvailableSubInfos = null;
+    private List<SubInfoRecord> mSubInfoList = null;
+
+    private SubInfoRecord mCellularData = null;
+    private SubInfoRecord mCalls = null;
+    private SubInfoRecord mSMS = null;
+
+    /**
+     * Return whether or not the user should have a SIM Cards option in Settings.
+     * TODO: Change back to returning true if count is greater than one after testing.
+     * TODO: See bug 16533525.
+     */
+    public static boolean showSimCardScreen(Context context) {
+        final TelephonyManager tm =
+            (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+
+        return tm.getSimCount() > 0;
+    }
+
+    public SimSettings() {
+        super(DISALLOW_CONFIG_SIM);
+    }
+
+    @Override
+    public void onCreate(final Bundle bundle) {
+        super.onCreate(bundle);
+
+        if (mSubInfoList == null) {
+            mSubInfoList = SubscriptionManager.getActivatedSubInfoList(getActivity());
+        }
+
+        createPreferences();
+        updateAllOptions();
+    }
+
+    private void createPreferences() {
+        final TelephonyManager tm =
+            (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+
+        addPreferencesFromResource(R.xml.sim_settings);
+
+        final PreferenceCategory simCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY);
+
+        final int numSlots = tm.getSimCount();
+        mAvailableSubInfos = new ArrayList<SubInfoRecord>(numSlots);
+        for (int i = 0; i < numSlots; ++i) {
+            final SubInfoRecord sir = findRecordBySlotId(i);
+            simCards.addPreference(new SimPreference(getActivity(), sir, i));
+            mAvailableSubInfos.add(sir);
+        }
+
+        updateActivitesCategory();
+    }
+
+    private void updateAllOptions() {
+        updateSimSlotValues();
+        updateActivitesCategory();
+    }
+
+    private void updateSimSlotValues() {
+        SubscriptionManager.getAllSubInfoList(getActivity());
+        final PreferenceCategory simCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY);
+        final PreferenceScreen prefScreen = getPreferenceScreen();
+
+        final int prefSize = prefScreen.getPreferenceCount();
+        for (int i = 0; i < prefSize; ++i) {
+            Preference pref = prefScreen.getPreference(i);
+            if (pref instanceof SimPreference) {
+                ((SimPreference)pref).update();
+            }
+        }
+    }
+
+    private void updateActivitesCategory() {
+        createDropDown((DropDownPreference) findPreference(KEY_CELLULAR_DATA));
+        createDropDown((DropDownPreference) findPreference(KEY_CALLS));
+        createDropDown((DropDownPreference) findPreference(KEY_SMS));
+
+        updateCellularDataValues();
+        updateCallValues();
+        updateSmsValues();
+    }
+
+    /**
+     * finds a record with subId.
+     * Since the number of SIMs are few, an array is fine.
+     */
+    private SubInfoRecord findRecordBySubId(final long subId) {
+        final int availableSubInfoLength = mAvailableSubInfos.size();
+
+        for (int i = 0; i < availableSubInfoLength; ++i) {
+            final SubInfoRecord sir = mAvailableSubInfos.get(i);
+            if (sir != null && sir.mSubId == subId) {
+                return sir;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * finds a record with slotId.
+     * Since the number of SIMs are few, an array is fine.
+     */
+    private SubInfoRecord findRecordBySlotId(final int slotId) {
+        if (mSubInfoList != null){
+            final int availableSubInfoLength = mSubInfoList.size();
+
+            for (int i = 0; i < availableSubInfoLength; ++i) {
+                final SubInfoRecord sir = mSubInfoList.get(i);
+                if (sir.mSlotId == slotId) {
+                    //Right now we take the first subscription on a SIM.
+                    return sir;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private void updateSmsValues() {
+        final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_SMS);
+        final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getPreferredSmsSubId());
+        if (sir != null) {
+            simPref.setSelectedItem(sir.mSlotId + 1);
+        }
+    }
+
+    private void updateCellularDataValues() {
+        final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_CELLULAR_DATA);
+        final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultDataSubId());
+        if (sir != null) {
+            simPref.setSelectedItem(sir.mSlotId);
+        }
+    }
+
+    private void updateCallValues() {
+        final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_CALLS);
+        final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultVoiceSubId());
+        if (sir != null) {
+            simPref.setSelectedItem(sir.mSlotId + 1);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateAllOptions();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(final PreferenceScreen preferenceScreen,
+            final Preference preference) {
+        if (preference instanceof SimPreference) {
+            ((SimPreference)preference).createEditDialog((SimPreference)preference);
+        }
+
+        return true;
+    }
+
+    public void createDropDown(DropDownPreference preference) {
+        final DropDownPreference simPref = preference;
+        final String keyPref = simPref.getKey();
+        final boolean askFirst = keyPref.equals(KEY_CALLS) || keyPref.equals(KEY_SMS);
+
+        simPref.clearItems();
+
+        if (askFirst) {
+            simPref.addItem(getResources().getString(
+                    R.string.sim_calls_ask_first_prefs_title), null);
+        }
+
+        final int subAvailableSize = mAvailableSubInfos.size();
+        for (int i = 0; i < subAvailableSize; ++i) {
+            final SubInfoRecord sir = mAvailableSubInfos.get(i);
+            if(sir != null){
+                simPref.addItem(sir.mDisplayName, sir);
+            }
+        }
+
+        simPref.setCallback(new DropDownPreference.Callback() {
+            @Override
+            public boolean onItemSelected(int pos, Object value) {
+                final long subId = value == null ? 0 : ((SubInfoRecord)value).mSubId;
+
+                if (simPref.getKey().equals(KEY_CELLULAR_DATA)) {
+                    SubscriptionManager.setDefaultDataSubId(subId);
+                } else if (simPref.getKey().equals(KEY_CALLS)) {
+                    SubscriptionManager.setDefaultVoiceSubId(subId);
+                } else if (simPref.getKey().equals(KEY_SMS)) {
+                    // TODO: uncomment once implemented. Bug: 16520931
+                    // SubscriptionManager.setDefaultSMSSubId(subId);
+                }
+
+                updateAllOptions();
+
+                return true;
+            }
+        });
+    }
+
+    private void setActivity(Preference preference, SubInfoRecord sir) {
+        final String key = preference.getKey();
+
+        if (key.equals(KEY_CELLULAR_DATA)) {
+            mCellularData = sir;
+        } else if (key.equals(KEY_CALLS)) {
+            mCalls = sir;
+        } else if (key.equals(KEY_SMS)) {
+            mSMS = sir;
+        }
+
+        updateActivitesCategory();
+    }
+
+    private class SimPreference extends Preference{
+        private SubInfoRecord mSubInfoRecord;
+        private int mSlotId;
+
+        public SimPreference(Context context, SubInfoRecord subInfoRecord, int slotId) {
+            super(context);
+
+            mSubInfoRecord = subInfoRecord;
+            mSlotId = slotId;
+            setKey("sim" + mSlotId);
+            update();
+        }
+
+        public void update() {
+            final Resources res = getResources();
+
+            setTitle(res.getString(R.string.sim_card_number_title, mSlotId + 1));
+            if (mSubInfoRecord != null) {
+                setSummary(res.getString(R.string.sim_settings_summary,
+                            mSubInfoRecord.mDisplayName, mSubInfoRecord.mNumber));
+                setEnabled(true);
+            } else {
+                setSummary(R.string.sim_slot_empty);
+                setFragment(null);
+                setEnabled(false);
+            }
+        }
+
+        public void createEditDialog(SimPreference simPref) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+            final View dialogLayout = getActivity().getLayoutInflater().inflate(
+                    R.layout.multi_sim_dialog, null);
+            builder.setView(dialogLayout);
+
+            EditText nameText = (EditText)dialogLayout.findViewById(R.id.sim_name);
+            nameText.setText(mSubInfoRecord.mDisplayName);
+
+            TextView numberView = (TextView)dialogLayout.findViewById(R.id.number);
+            numberView.setText(mSubInfoRecord.mNumber);
+
+            TextView carrierView = (TextView)dialogLayout.findViewById(R.id.carrier);
+            carrierView.setText(mSubInfoRecord.mDisplayName);
+
+            builder.setTitle(R.string.sim_editor_title);
+
+            builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int whichButton) {
+                    final EditText nameText = (EditText)dialogLayout.findViewById(R.id.sim_name);
+                    final Spinner displayNumbers =
+                        (Spinner)dialogLayout.findViewById(R.id.display_numbers);
+
+                    SubscriptionManager.setDisplayNumberFormat(getActivity(),
+                        displayNumbers.getSelectedItemPosition() == 0
+                            ? SubscriptionManager.DISPLAY_NUMBER_LAST
+                            : SubscriptionManager.DISPLAY_NUMBER_FIRST, mSubInfoRecord.mSubId);
+
+                    mSubInfoRecord.mDisplayName = nameText.getText().toString();
+                    SubscriptionManager.setDisplayName(getActivity(), mSubInfoRecord.mDisplayName,
+                        mSubInfoRecord.mSubId);
+
+                    updateAllOptions();
+                }
+            });
+
+            builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int whichButton) {
+                    dialog.dismiss();
+                }
+            });
+
+            builder.create().show();
+        }
+    }
+}