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/Settings.java b/src/com/android/settings/Settings.java
index a96fb1e..2b486aa 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -33,7 +33,6 @@
public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }
public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
public static class DateTimeSettingsActivity extends SettingsActivity { /* empty */ }
- public static class StorageSettingsActivity extends SettingsActivity { /* empty */ }
public static class PrivateVolumeForgetActivity extends SettingsActivity { /* empty */ }
public static class PrivateVolumeSettingsActivity extends SettingsActivity { /* empty */ }
public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ }
@@ -156,12 +155,6 @@
public static class EnterprisePrivacySettingsActivity extends SettingsActivity { /* empty */ }
public static class WebViewAppPickerActivity extends SettingsActivity { /* empty */ }
- // Categories.
- public static class WirelessSettings extends SettingsActivity { /* empty */ }
- public static class DeviceSettings extends SettingsActivity { /* empty */ }
- public static class PersonalSettings extends SettingsActivity { /* empty */ }
- public static class SystemSettings extends SettingsActivity { /* empty */ }
-
// Top level categories for new IA
public static class NetworkDashboardActivity extends SettingsActivity {}
public static class ConnectedDeviceDashboardActivity extends SettingsActivity {}
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()),
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 742f727..59c5014 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -243,47 +243,38 @@
};
public static final String[] SETTINGS_FOR_RESTRICTED = {
- //wireless_section
- Settings.WifiSettingsActivity.class.getName(),
- Settings.BluetoothSettingsActivity.class.getName(),
- Settings.SimSettingsActivity.class.getName(),
- //device_section
- Settings.SoundSettingsActivity.class.getName(),
- Settings.DisplaySettingsActivity.class.getName(),
- Settings.StorageSettingsActivity.class.getName(),
- Settings.ManageApplicationsActivity.class.getName(),
- Settings.PowerUsageSummaryActivity.class.getName(),
- //personal_section
- Settings.LocationSettingsActivity.class.getName(),
- Settings.SecuritySettingsActivity.class.getName(),
- Settings.UserSettingsActivity.class.getName(),
- //system_section
- Settings.DateTimeSettingsActivity.class.getName(),
- Settings.DeviceInfoSettingsActivity.class.getName(),
- Settings.AccessibilitySettingsActivity.class.getName(),
- Settings.PrintSettingsActivity.class.getName(),
- Settings.PaymentSettingsActivity.class.getName(),
-
-
// New IA
// Home page
Settings.NetworkDashboardActivity.class.getName(),
Settings.ConnectedDeviceDashboardActivity.class.getName(),
- Settings.WifiDisplaySettingsActivity.class.getName(),
Settings.AppAndNotificationDashboardActivity.class.getName(),
+ Settings.DisplaySettingsActivity.class.getName(),
+ Settings.SoundSettingsActivity.class.getName(),
Settings.StorageDashboardActivity.class.getName(),
- "com.android.settings.SoundDashboardAlias",
- "com.android.settings.UsersDashboardAlias",
+ Settings.PowerUsageSummaryActivity.class.getName(),
Settings.UserAndAccountDashboardActivity.class.getName(),
+ Settings.SecuritySettingsActivity.class.getName(),
+ Settings.AccessibilitySettingsActivity.class.getName(),
Settings.SystemDashboardActivity.class.getName(),
Settings.SupportDashboardActivity.class.getName(),
- // Home page > Apps & Notifications
- "com.android.settings.ManageApplicationsDashboardAlias",
- "com.android.settings.PaymentSettingsDashboardAlias",
// 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(),
+ Settings.PrintSettingsActivity.class.getName(),
+ // Home page > Apps & Notifications
+ Settings.UserSettingsActivity.class.getName(),
+ Settings.ManageApplicationsActivity.class.getName(),
+ Settings.PaymentSettingsActivity.class.getName(),
+ // Home page > Security & screen lock
+ Settings.LocationSettingsActivity.class.getName(),
// Home page > System
Settings.LanguageAndInputSettingsActivity.class.getName(),
+ Settings.DateTimeSettingsActivity.class.getName(),
+ Settings.DeviceInfoSettingsActivity.class.getName(),
Settings.EnterprisePrivacySettingsActivity.class.getName(),
};
}