DO NOT MERGE Reorganize intents to have the same order
Before AndroidManifest.xml and FragmentResolver.java placed the intents
in random order. This CL organizes them roughly in the order they
currently appear in AOSP Car Settings.
Bug: 114008723
Test: Build
Change-Id: I48af6bd6886b692760811c5d9b5b826b54bdb181
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b797d9e..92e94f9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -74,64 +74,19 @@
android:launchMode="singleTask"
android:windowSoftInputMode="adjustPan"
android:exported="true">
- <!-- Set priority high enough to trump the phone setting app -->
+ <!-- Keep the order of intents same as .common.FragmentResolver -->
<intent-filter android:priority="1">
<action android:name="android.settings.SETTINGS" />
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
- <!-- Handles wifi related intent -->
- <intent-filter android:priority="1">
- <action android:name="android.settings.WIFI_SETTINGS" />
- <action android:name="android.settings.WIRELESS_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
-
- <intent-filter android:priority="100">
- <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
-
<intent-filter android:priority="1">
<action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter android:priority="1">
- <action android:name="android.settings.USER_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
-
- <intent-filter android:priority="1">
- <action android:name="android.settings.BLUETOOTH_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
-
- <intent-filter android:priority="100">
- <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
- <action android:name="android.settings.DEVICE_NAME" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
-
- <intent-filter android:priority="100">
- <action android:name="android.settings.LOCALE_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT"/>
- </intent-filter>
-
- <intent-filter android:priority="100">
- <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT"/>
- </intent-filter>
-
- <intent-filter android:priority="1">
- <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
- <data android:scheme="package" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
-
- <intent-filter android:priority="1">
- <action android:name="android.settings.DATE_SETTINGS" />
- <action android:name="android.intent.action.QUICK_CLOCK" />
+ <action android:name="android.settings.DISPLAY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@@ -140,16 +95,27 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="1">
- <action android:name="android.settings.DISPLAY_SETTINGS" />
- <action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" />
+ <intent-filter android:priority="100">
+ <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
+ <action android:name="android.settings.WIFI_SETTINGS" />
+ <action android:name="android.settings.WIRELESS_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ <intent-filter android:priority="100">
+ <action android:name="android.settings.DATA_USAGE_SETTINGS" />
+ <action android:name="android.settings.MOBILE_DATA_USAGE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ <intent-filter android:priority="100">
+ <action android:name="android.settings.DATA_ROAMING_SETTINGS" />
+ <action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter android:priority="1">
- <action android:name="android.settings.APPLICATION_SETTINGS" />
- <action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
- <action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
+ <action android:name="android.settings.BLUETOOTH_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@@ -163,13 +129,18 @@
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
- <intent-filter android:priority="100">
- <action android:name="android.settings.SYNC_SETTINGS" />
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.APPLICATION_SETTINGS" />
+ <action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
+ <action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter android:priority="100">
- <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
+ <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
+ <action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />
+ <action android:name="android.settings.APP_NOTIFICATION_SETTINGS" />
+ <data android:scheme="package" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@@ -179,21 +150,46 @@
</intent-filter>
<intent-filter android:priority="100">
- <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
-
- <intent-filter android:priority="100">
<action android:name="android.settings.VOICE_INPUT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter android:priority="100">
- <action android:name="android.settings.DATA_USAGE_SETTINGS" />
- <action android:name="android.settings.MOBILE_DATA_USAGE" />
+ <action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.DATE_SETTINGS" />
+ <action android:name="android.intent.action.QUICK_CLOCK" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.USER_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ <intent-filter android:priority="100">
+ <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ <intent-filter android:priority="100">
+ <action android:name="android.settings.SYNC_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ <intent-filter android:priority="100">
+ <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ <intent-filter android:priority="100">
+ <action android:name="android.settings.LOCALE_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+
<intent-filter android:priority="100">
<action android:name="android.settings.REQUEST_SET_AUTOFILL_SERVICE" />
<category android:name="android.intent.category.DEFAULT" />
@@ -201,19 +197,13 @@
</intent-filter>
<intent-filter android:priority="100">
- <action android:name="android.settings.DATA_ROAMING_SETTINGS" />
- <action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter android:priority="100">
- <action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />
- <action android:name="android.settings.APP_NOTIFICATION_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
-
- <intent-filter android:priority="100">
- <action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" />
+ <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
+ <action android:name="android.settings.DEVICE_NAME" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>