commit 3815561997eced7fd773062ce32eaa50bece072c
author PauloftheWest <paulofthewest@google.com> Mon Jun 30 10:02:36 2014 -0700
committer PauloftheWest <paulofthewest@google.com> Thu Jul 24 06:41:12 2014 -0700
tree 7c951c7caf8831c218e3554e00c67631f20feadc
parent 2513851ace8d353f99146316b81a430add6d837f

Added SIM Card Activity to Settings

+ Added SIM Card menu to Settings menu
+ Added SIM card detail dialog when selecting a SIM Card
+ Added ability to select the default SIM for Cellular data, Calls, and SMS

Bug: 16241745

Change-Id: I43437aa4c591c5097a8865d564f88726671e1b7d

src/com/android/settings/SettingsActivity.java

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);