From 250131665c35e41c43ef1128968c608fffcb329c Mon Sep 17 00:00:00 2001
From: Yilin Cai <cyl@google.com>
Date: Tue, 31 Jan 2023 11:52:31 +0800
Subject: [PATCH] Use negative order in the special access items.

This is to ensure unspecified injected items show up at the bottom of the list.

Test: local build
Bug: 242280896
Change-Id: I2c4a0a15029be924f85e4145faed17a2a8cd3594
---
 res/xml/special_access.xml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index e6dd3edfb9b..1b4aeb0ada4 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -22,7 +22,7 @@
     <Preference
         android:key="manage_external_storage"
         android:title="@string/manage_external_storage_title"
-        android:order="100"
+        android:order="-1900"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
         <extra
             android:name="classname"
@@ -32,7 +32,7 @@
     <Preference
         android:key="interact_across_profiles"
         android:title="@string/interact_across_profiles_title"
-        android:order="200"
+        android:order="-1800"
         android:fragment="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettings"
         settings:keywords="@string/interact_across_profiles_keywords"
         settings:controller="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesController" />
@@ -40,7 +40,7 @@
     <Preference
         android:key="device_administrators"
         android:title="@string/manage_device_admin"
-        android:order="300"
+        android:order="-1700"
         android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings"
         android:summary="@string/summary_placeholder"
         settings:searchable="false"
@@ -49,7 +49,7 @@
     <Preference
         android:key="system_alert_window_app_list"
         android:title="@string/system_alert_window_settings"
-        android:order="400"
+        android:order="-1600"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_draw_overlay"
         settings:controller="com.android.settings.applications.specialaccess.SystemAlertWindowPreferenceController">
@@ -61,14 +61,14 @@
     <Preference
         android:key="zen_access"
         android:title="@string/manage_zen_access_title"
-        android:order="500"
+        android:order="-1500"
         android:fragment="com.android.settings.notification.zen.ZenAccessSettings"
         settings:controller="com.android.settings.applications.specialaccess.zenaccess.ZenAccessController" />
 
     <Preference
         android:key="media_management_apps"
         android:title="@string/media_management_apps_title"
-        android:order="600"
+        android:order="-1400"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_media_management_apps">
         <extra
@@ -79,7 +79,7 @@
     <Preference
         android:key="write_settings_apps"
         android:title="@string/write_settings"
-        android:order="700"
+        android:order="-1300"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_write_settings">
         <extra
@@ -90,14 +90,14 @@
     <Preference
         android:key="notification_access"
         android:title="@string/manage_notification_access_title"
-        android:order="800"
+        android:order="-1200"
         android:fragment="com.android.settings.notification.NotificationAccessSettings"
         settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessController" />
 
     <Preference
         android:key="picture_in_picture"
         android:title="@string/picture_in_picture_title"
-        android:order="900"
+        android:order="-1100"
         android:fragment="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureSettings"
         settings:keywords="@string/picture_in_picture_keywords"
         settings:controller="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureController" />
@@ -105,7 +105,7 @@
     <Preference
         android:key="premium_sms"
         android:title="@string/premium_sms_access"
-        android:order="1000"
+        android:order="-1000"
         android:fragment="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess"
         settings:isPreferenceVisible="@bool/config_show_premium_sms"
         settings:controller="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsController" />
@@ -113,7 +113,7 @@
     <Preference
         android:key="data_saver"
         android:title="@string/unrestricted_data_saver"
-        android:order="1100"
+        android:order="-900"
         android:fragment="com.android.settings.datausage.UnrestrictedDataAccess"
         settings:isPreferenceVisible="@bool/config_show_data_saver"
         settings:controller="com.android.settings.applications.specialaccess.DataSaverController" />
@@ -121,7 +121,7 @@
     <Preference
         android:key="long_background_tasks"
         android:title="@string/long_background_tasks_title"
-        android:order="1200"
+        android:order="-800"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_long_background_tasks"
         settings:controller="com.android.settings.applications.specialaccess.applications.LongBackgroundTaskController">
@@ -133,7 +133,7 @@
     <Preference
         android:key="manage_external_sources"
         android:title="@string/install_other_apps"
-        android:order="1300"
+        android:order="-700"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_install_other_apps">
         <extra
@@ -144,7 +144,7 @@
     <Preference
         android:key="alarms_and_reminders"
         android:title="@string/alarms_and_reminders_title"
-        android:order="1400"
+        android:order="-600"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_alarms_and_reminders">
         <extra
@@ -155,7 +155,7 @@
     <Preference
         android:key="special_app_usage_access"
         android:title="@string/usage_access"
-        android:order="1500"
+        android:order="-500"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_write_settings">
         <extra
@@ -166,7 +166,7 @@
     <Preference
         android:key="enabled_vr_listeners"
         android:title="@string/vr_listeners_title"
-        android:order="1600"
+        android:order="-400"
         android:fragment="com.android.settings.applications.specialaccess.vrlistener.VrListenerSettings"
         settings:keywords="@string/keywords_vr_listener"
         settings:controller="com.android.settings.applications.specialaccess.vrlistener.EnabledVrListenersController">
@@ -178,7 +178,7 @@
     <Preference
         android:key="change_wifi_state"
         android:title="@string/change_wifi_state_title"
-        android:order="1700"
+        android:order="-300"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
         settings:keywords="@string/keywords_change_wifi_state">
         <extra
@@ -189,12 +189,12 @@
     <Preference
         android:key="turn_screen_on"
         android:title="@string/turn_screen_on_title"
-        android:order="1800"
+        android:order="-200"
         android:fragment="com.android.settings.applications.specialaccess.turnscreenon.TurnScreenOnSettings" />
 
     <Preference
         android:key="special_access_more"
         android:title="@string/special_access_more"
-        android:order="1900"
+        android:order="-100"
         settings:controller="com.android.settings.applications.specialaccess.MoreSpecialAccessPreferenceController" />
 </PreferenceScreen>