Move a11y entry point to top level menu.
Bug: 31781480
Test: make RunSettingsRoboTests still pass
Change-Id: I4f50aa56603750728ce0f3c82c3da720b3e6f09f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3c35428..30eed48 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3083,10 +3083,22 @@
android:value="com.android.settings.datausage.DataUsageSummary"/>
</activity-alias>
+ <activity android:name=".Settings$ConnectedDeviceDashboardActivity"
+ android:label="@string/connected_devices_dashboard_title"
+ android:icon="@drawable/ic_bt_laptop">
+ <intent-filter android:priority="10">
+ <action android:name="com.android.settings.action.SETTINGS"/>
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
+ <meta-data android:name="com.android.settings.category"
+ android:value="com.android.settings.category.ia.homepage"/>
+ </activity>
+
<activity android:name=".Settings$AppAndNotificationDashboardActivity"
android:label="@string/app_and_notification_dashboard_title"
android:icon="@drawable/ic_settings_applications">
- <intent-filter android:priority="8">
+ <intent-filter android:priority="9">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3097,7 +3109,7 @@
<activity-alias android:name="BatteryDashboardAlias"
android:targetActivity="Settings$PowerUsageSummaryActivity">
- <intent-filter android:priority="7">
+ <intent-filter android:priority="8">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3108,7 +3120,7 @@
<activity-alias android:name="DisplayDashboardAlias"
android:targetActivity="Settings$DisplaySettingsActivity">
- <intent-filter android:priority="6">
+ <intent-filter android:priority="7">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
@@ -3121,7 +3133,7 @@
<activity-alias android:name="SoundDashboardAlias"
android:targetActivity="Settings$SoundSettingsActivity">
- <intent-filter android:priority="5">
+ <intent-filter android:priority="6">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
@@ -3135,7 +3147,7 @@
<activity android:name=".Settings$StorageDashboardActivity"
android:label="@string/storage_settings"
android:icon="@drawable/ic_settings_storage">
- <intent-filter android:priority="4">
+ <intent-filter android:priority="5">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
@@ -3162,7 +3174,7 @@
<activity-alias android:name="SecurityDashboardAlias"
android:targetActivity="Settings$SecuritySettingsActivity">
- <intent-filter android:priority="3">
+ <intent-filter android:priority="4">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
@@ -3173,6 +3185,18 @@
android:value="true" />
</activity-alias>
+ <activity android:name=".Settings$UserAndAccountDashboardActivity"
+ android:label="@string/account_dashboard_title"
+ android:icon="@drawable/ic_settings_accounts">
+ <intent-filter android:priority="3">
+ <action android:name="com.android.settings.action.SETTINGS"/>
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.accounts.UserAndAccountDashboardFragment"/>
+ <meta-data android:name="com.android.settings.category"
+ android:value="com.android.settings.category.ia.homepage"/>
+ </activity>
+
<activity-alias android:name="LocationDashboardAlias"
android:targetActivity="Settings$LocationSettingsActivity">
<intent-filter>
@@ -3186,6 +3210,19 @@
android:value="true" />
</activity-alias>
+ <activity-alias android:name="AccessibilityDashboardAlias"
+ android:targetActivity="Settings$AccessibilitySettingsActivity">
+ <intent-filter android:priority="2">
+ <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.accessibility.AccessibilitySettings" />
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity-alias>
+
<activity android:name=".Settings$SystemDashboardActivity"
android:label="@string/header_category_system"
android:icon="@drawable/ic_settings_about">
@@ -3257,19 +3294,6 @@
android:value="true" />
</activity-alias>
- <activity-alias android:name="AccessibilityDashboardAlias"
- android:targetActivity="Settings$AccessibilitySettingsActivity">
- <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.system" />
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.accessibility.AccessibilitySettings" />
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
- </activity-alias>
-
<activity-alias android:name="PrivacyDashboardAlias"
android:targetActivity="Settings$PrivacySettingsActivity">
<intent-filter android:priority="60">
@@ -3334,18 +3358,6 @@
android:value="com.android.settings.applications.ProcessStatsSummary" />
</activity-alias>
- <activity android:name=".Settings$ConnectedDeviceDashboardActivity"
- android:label="@string/connected_devices_dashboard_title"
- android:icon="@drawable/ic_bt_laptop">
- <intent-filter android:priority="9">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage"/>
- </activity>
-
<activity-alias android:name="BluetoothDashboardAlias"
android:targetActivity="Settings$BluetoothSettingsActivity">
<intent-filter android:priority="7">
@@ -3416,18 +3428,6 @@
android:value="true" />
</activity-alias>
- <activity android:name=".Settings$UserAndAccountDashboardActivity"
- android:label="@string/account_dashboard_title"
- android:icon="@drawable/ic_settings_accounts">
- <intent-filter android:priority="2">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.accounts.UserAndAccountDashboardFragment"/>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage"/>
- </activity>
-
<activity-alias android:name="UserDashboardAlias"
android:targetActivity="Settings$UserSettingsActivity">
<intent-filter android:priority="8">