Remove priority from intent-filters for IA items
And use ORDER metadata instead.
Bug: 77600770
Test: robotests
Change-Id: I9862c89ff5b601fbb9fb53eaa91f03d95d501284
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e2e89bd..3627b63 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -183,9 +183,10 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
- <intent-filter android:priority="11">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="11"/>
<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"
@@ -208,9 +209,10 @@
<action android:name="android.settings.BLUETOOTH_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="10">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="10"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
<meta-data android:name="com.android.settings.category"
@@ -889,9 +891,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="7">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="7"/>
<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"
@@ -1252,9 +1255,10 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
- <intent-filter android:priority="4">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="4"/>
<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"
@@ -1405,9 +1409,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="2">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="2"/>
<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"
@@ -1738,9 +1743,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="5">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="5"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.title"
@@ -2133,9 +2139,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="8">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="8"/>
<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"
@@ -2504,9 +2511,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="6">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="6"/>
<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"
@@ -2925,9 +2933,10 @@
android:icon="@drawable/ic_homepage_apps"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
- <intent-filter android:priority="9">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="9"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.AppAndNotificationDashboardFragment"/>
<meta-data android:name="com.android.settings.category"
@@ -2942,7 +2951,7 @@
android:icon="@drawable/ic_homepage_accounts"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
- <intent-filter android:priority="3">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<intent-filter android:priority="1">
@@ -2953,6 +2962,7 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="3"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.accounts.AccountDashboardFragment"/>
<meta-data android:name="com.android.settings.category"
@@ -2967,13 +2977,14 @@
android:icon="@drawable/ic_homepage_system_dashboard"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
- <intent-filter android:priority="-1">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<intent-filter android:priority="70">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-1"/>
<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"
@@ -2987,13 +2998,14 @@
android:icon="@drawable/ic_homepage_support"
android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
android:enabled="@bool/config_support_enabled">
- <intent-filter android:priority="-2">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<intent-filter>
<action android:name="com.android.settings.action.SUPPORT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-2"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.summary"