Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev

am: 067332ca9e

Change-Id: I7659232cad1d477864b310cc83d41ae6a9bd4f0f

src/com/android/settings/SettingsActivity.java

@@ -612,11 +612,6 @@ public class SettingsActivity extends SettingsBaseActivity
                 !UserManager.isDeviceInDemoMode(this) /* enabled */,
                 isAdmin) || somethingChanged;
 
-        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
-                        Settings.SimSettingsActivity.class.getName()),
-                Utils.showSimCardTile(this), isAdmin)
-                || somethingChanged;
-
         somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
                         Settings.PowerUsageSummaryActivity.class.getName()),
                 mBatteryPresent, isAdmin) || somethingChanged;

src/com/android/settings/core/gateway/SettingsGateway.java

@@ -300,7 +300,6 @@ public class SettingsGateway {
             // Home page > Network & Internet
             Settings.WifiSettingsActivity.class.getName(),
             Settings.DataUsageSummaryActivity.class.getName(),
-            Settings.SimSettingsActivity.class.getName(),
             // Home page > Connected devices
             Settings.BluetoothSettingsActivity.class.getName(),
             Settings.WifiDisplaySettingsActivity.class.getName(),