commit 32faee27f45f404f2e026fd4c4c0aa4a5e513448
author Yanting Yang <yantingyang@google.com> Thu Mar 18 22:59:23 2021 +0800
committer Yanting Yang <yantingyang@google.com> Fri Mar 19 12:14:05 2021 +0800
tree 19ef8b9975dff730f1bc90f11f22a42ba00e623c
parent 69e911b66b4d9d9c33771bb934890b7d738c3268

Change order of Security and Privacy on Homepage

Fixes: 180093517
Test: visual
Change-Id: I853b36ce5d6f2e9e365524df4860fb9e522c9321

res/xml/top_level_settings_grouped.xml

diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml
index 6eac0ed..704a106 100644
--- a/res/xml/top_level_settings_grouped.xml
+++ b/res/xml/top_level_settings_grouped.xml
@@ -97,29 +97,29 @@
         settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
 
     <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.security.SecuritySettings"
+        android:icon="@drawable/ic_homepage_security_v2"
+        android:key="top_level_security"
+        android:order="-50"
+        android:title="@string/security_settings_title"
+        settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
+
+    <com.android.settings.homepage.HomepagePreference
         android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
         android:icon="@drawable/ic_homepage_privacy_v2"
         android:key="top_level_privacy"
-        android:order="-50"
+        android:order="-40"
         android:title="@string/privacy_dashboard_title"/>
 
     <com.android.settings.homepage.HomepagePreference
         android:fragment="com.android.settings.location.LocationSettings"
         android:icon="@drawable/ic_homepage_location_v2"
         android:key="top_level_location"
-        android:order="-40"
+        android:order="-30"
         android:title="@string/location_settings_title"
         settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
 
     <com.android.settings.homepage.HomepagePreference
-        android:fragment="com.android.settings.security.SecuritySettings"
-        android:icon="@drawable/ic_homepage_security_v2"
-        android:key="top_level_security"
-        android:order="-30"
-        android:title="@string/security_settings_title"
-        settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
-
-    <com.android.settings.homepage.HomepagePreference
         android:key="top_level_emergency"
         android:title="@string/emergency_settings_preference_title"
         android:icon="@drawable/ic_homepage_emergency_v2"