diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5149b9c25f2..603900c1aed 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -183,6 +183,7 @@ + @@ -2624,27 +2625,6 @@ android:resource="@xml/file_paths" /> - - - - - - - - - - - - - - diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 5f2e1a9f071..4ac4be4b209 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/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; diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index 19843a65053..24fccef9dd7 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/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(),