Remove some dashboard alias
- remove UsersDashboardAlias, PaymentSettingsDashboardAlias,
ManageApplicationsDashboardAlias, and AppNotificationDashboardAlias,
and merge the metadata into the target activity
- remove StorageActivity
- remove the old top level settings categories
Bug: 35764802
Test: RunSettingsRoboTests
Change-Id: I0faf006c92a1822228bea20ad884cd9a21696fd3
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index d5e886f..ffc051e 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -383,11 +383,7 @@
final ComponentName cn = intent.getComponent();
final String className = cn.getClassName();
- mIsShowingDashboard = className.equals(Settings.class.getName())
- || className.equals(Settings.WirelessSettings.class.getName())
- || className.equals(Settings.DeviceSettings.class.getName())
- || className.equals(Settings.PersonalSettings.class.getName())
- || className.equals(Settings.WirelessSettings.class.getName());
+ mIsShowingDashboard = className.equals(Settings.class.getName());
// This is a "Sub Settings" when:
// - this is a real SubSettings
@@ -936,11 +932,6 @@
pm.hasSystemFeature(PackageManager.FEATURE_NFC)
&& pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
&& adapter != null && adapter.isEnabled(), isAdmin);
- setTileEnabled(new ComponentName(packageName,
- "com.android.settings.PaymentSettingsDashboardAlias"),
- pm.hasSystemFeature(PackageManager.FEATURE_NFC)
- && pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
- && adapter != null && adapter.isEnabled(), isAdmin);
setTileEnabled(new ComponentName(packageName,
Settings.PrintSettingsActivity.class.getName()),