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/AndroidManifest.xml b/AndroidManifest.xml
index b000c14..b3db932 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -122,38 +122,6 @@
<meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
</activity-alias>
- <activity android:name=".Settings$WirelessSettings"
- android:label="@string/header_category_wireless_networks">
- <intent-filter android:priority="4">
- <action android:name="com.android.settings.category.wireless" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
- <activity android:name=".Settings$DeviceSettings"
- android:label="@string/header_category_device">
- <intent-filter android:priority="3">
- <action android:name="com.android.settings.category.device" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
- <activity android:name=".Settings$PersonalSettings"
- android:label="@string/header_category_personal">
- <intent-filter android:priority="2">
- <action android:name="com.android.settings.category.personal" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
- <activity android:name=".SystemSettings"
- android:label="@string/header_category_system">
- <intent-filter android:priority="1">
- <action android:name="com.android.settings.category.system" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
<receiver android:name=".SettingsInitialize">
<intent-filter>
<action android:name="android.intent.action.USER_INITIALIZE"/>
@@ -265,11 +233,6 @@
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="4">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.wireless" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.wifi.WifiSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -440,11 +403,6 @@
<category android:name="com.android.settings.SHORTCUT" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="3">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.wireless" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.bluetooth.BluetoothSettings" />
</activity>
@@ -1020,11 +978,11 @@
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="6">
+ <intent-filter android:priority="200">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.device" />
+ android:value="com.android.settings.category.ia.apps" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.ManageApplications" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1039,8 +997,6 @@
<action android:name="android.settings.MANAGE_DOMAIN_URLS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.device" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.ManageDomainUrls" />
</activity>
@@ -1069,8 +1025,6 @@
<action android:name="android.settings.APP_MEMORY_USAGE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.device" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.ProcessStatsUi" />
</activity>
@@ -1285,11 +1239,6 @@
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="3">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.personal" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.location.LocationSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1500,8 +1449,6 @@
<action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.system" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1814,8 +1761,8 @@
android:value="com.android.settings.deviceinfo.ImeiInformation" />
</activity>
- <activity android:name="Settings$StorageSettingsActivity"
- android:label="@string/storage_settings_title"
+ <activity android:name=".Settings$StorageDashboardActivity"
+ android:label="@string/storage_settings"
android:icon="@drawable/ic_settings_storage"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
@@ -1833,7 +1780,7 @@
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.device" />
+ android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/storage_usb_settings" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1845,7 +1792,7 @@
<activity android:name="Settings$PrivateVolumeSettingsActivity"
android:label="@string/storage_settings_title"
android:taskAffinity="com.android.settings"
- android:parentActivityName="Settings$StorageSettingsActivity">
+ android:parentActivityName="Settings$StorageDashboardActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.PrivateVolumeSettings" />
</activity>
@@ -1853,7 +1800,7 @@
<activity android:name="Settings$PublicVolumeSettingsActivity"
android:label="@string/storage_settings_title"
android:taskAffinity="com.android.settings"
- android:parentActivityName="Settings$StorageSettingsActivity">
+ android:parentActivityName="Settings$StorageDashboardActivity">
<intent-filter>
<action android:name="android.provider.action.DOCUMENT_ROOT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1869,7 +1816,7 @@
<activity android:name="Settings$PrivateVolumeForgetActivity"
android:label="@string/storage_settings_title"
android:taskAffinity="com.android.settings"
- android:parentActivityName="Settings$StorageSettingsActivity"
+ android:parentActivityName="Settings$StorageDashboardActivity"
android:exported="true"
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -2443,11 +2390,11 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="2">
+ <intent-filter android:priority="8">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.device" />
+ android:value="com.android.settings.category.ia.accounts" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.users.UserSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2466,11 +2413,11 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="1">
+ <intent-filter android:priority="10">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.device" />
+ android:value="com.android.settings.category.ia.apps.default" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.nfc.PaymentSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2631,14 +2578,14 @@
<!-- Show apps for which application-level notification settings are applicable -->
<activity android:name="Settings$NotificationAppListActivity"
android:label="@string/app_notifications_title"
- android:icon="@drawable/ic_settings_notifications"
+ android:icon="@drawable/ic_notifications"
android:exported="true"
android:taskAffinity="">
- <intent-filter android:priority="8">
+ <intent-filter android:priority="150">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.device" />
+ android:value="com.android.settings.category.ia.apps" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.NotificationApps" />
</activity>
@@ -3001,20 +2948,6 @@
android:value="@string/app_and_notification_dashboard_summary"/>
</activity>
- <activity android:name=".Settings$StorageDashboardActivity"
- android:label="@string/storage_settings"
- android:icon="@drawable/ic_settings_storage">
- <intent-filter android:priority="5">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage" />
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.deviceinfo.StorageSettings" />
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
- </activity>
-
<activity android:name=".Settings$UserAndAccountDashboardActivity"
android:label="@string/account_dashboard_title"
android:icon="@drawable/ic_settings_accounts">
@@ -3062,32 +2995,6 @@
android:resource="@string/support_summary"/>
</activity>
- <activity-alias android:name="ManageApplicationsDashboardAlias"
- android:targetActivity="Settings$ManageApplicationsActivity">
- <intent-filter android:priority="200">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.apps" />
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.applications.ManageApplications" />
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
- </activity-alias>
-
- <activity-alias android:name="AppNotificationDashboardAlias"
- android:targetActivity="Settings$NotificationAppListActivity"
- android:icon="@drawable/ic_notifications">
- <intent-filter android:priority="150">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.apps"/>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.applications.NotificationApps"/>
-
- </activity-alias>
-
<activity-alias android:name="ConfigureNotificationDashboardAlias"
android:targetActivity="Settings$ConfigureNotificationSettingsActivity">
<intent-filter android:priority="120">
@@ -3101,19 +3008,6 @@
android:value="true" />
</activity-alias>
- <activity-alias android:name="UsersDashboardAlias"
- android:targetActivity="Settings$UserSettingsActivity">
- <intent-filter android:priority="8">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.users.UserSettings" />
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.accounts" />
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
- </activity-alias>
-
<activity-alias android:name="AppDefaultDashboardAlias"
android:targetActivity="Settings$AdvancedAppsActivity"
android:label="@string/app_default_dashboard_title"
@@ -3129,19 +3023,6 @@
android:value="true" />
</activity-alias>
- <activity-alias android:name="PaymentSettingsDashboardAlias"
- android:targetActivity="Settings$PaymentSettingsActivity">
- <intent-filter android:priority="10">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.apps.default"/>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.nfc.PaymentSettings"/>
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true"/>
- </activity-alias>
-
<!-- End of information architecture host activities -->
<service
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(),
};
}