Merge "Fix order of Android sources on Privacy subpage"

2 files changed, 20 insertions, 20 deletions

diff --git a/SafetyCenter/Resources/res/raw-v34/safety_center_config.xml b/SafetyCenter/Resources/res/raw-v34/safety_center_config.xml
index 94123b2de..dad778196 100644
--- a/SafetyCenter/Resources/res/raw-v34/safety_center_config.xml
+++ b/SafetyCenter/Resources/res/raw-v34/safety_center_config.xml
@@ -44,13 +44,6 @@
             summary="@com.android.safetycenter.resources:string/privacy_sources_summary"
             statelessIconType="privacy">
             <static-safety-source
-                id="AndroidPermissionUsage"
-                profile="primary_profile_only"
-                intentAction="android.intent.action.REVIEW_PERMISSION_USAGE"
-                title="@com.android.safetycenter.resources:string/permission_usage_title"
-                summary="@com.android.safetycenter.resources:string/permission_usage_summary"
-                searchTerms="@com.android.safetycenter.resources:string/permission_usage_search_terms"/>
-            <static-safety-source
                 id="AndroidPermissionManager"
                 profile="primary_profile_only"
                 intentAction="android.intent.action.MANAGE_PERMISSIONS"
@@ -58,12 +51,12 @@
                 summary="@com.android.safetycenter.resources:string/permission_manager_summary"
                 searchTerms="@com.android.safetycenter.resources:string/permission_manager_search_terms"/>
             <static-safety-source
-                id="AndroidPrivacyControls"
+                id="AndroidPermissionUsage"
                 profile="primary_profile_only"
-                intentAction="android.settings.PRIVACY_CONTROLS"
-                title="@com.android.safetycenter.resources:string/privacy_controls_title"
-                summary="@com.android.safetycenter.resources:string/privacy_controls_summary"
-                searchTerms="@com.android.safetycenter.resources:string/privacy_controls_search_terms"/>
+                intentAction="android.intent.action.REVIEW_PERMISSION_USAGE"
+                title="@com.android.safetycenter.resources:string/permission_usage_title"
+                summary="@com.android.safetycenter.resources:string/permission_usage_summary"
+                searchTerms="@com.android.safetycenter.resources:string/permission_usage_search_terms"/>
             <static-safety-source
                 id="AndroidAdsPrivacy"
                 profile="primary_profile_only"
@@ -71,6 +64,20 @@
                 title="@com.android.safetycenter.resources:string/ads_privacy_title"
                 summary="@com.android.safetycenter.resources:string/ads_privacy_summary"
                 searchTerms="@com.android.safetycenter.resources:string/ads_privacy_search_terms"/>
+            <static-safety-source
+                id="AndroidHealthConnect"
+                profile="primary_profile_only"
+                intentAction="android.health.connect.action.HEALTH_HOME_SETTINGS"
+                title="@com.android.safetycenter.resources:string/health_connect_title"
+                summary="@com.android.safetycenter.resources:string/health_connect_summary"
+                searchTerms="@com.android.safetycenter.resources:string/health_connect_search_terms"/>
+            <static-safety-source
+                id="AndroidPrivacyControls"
+                profile="primary_profile_only"
+                intentAction="android.settings.PRIVACY_CONTROLS"
+                title="@com.android.safetycenter.resources:string/privacy_controls_title"
+                summary="@com.android.safetycenter.resources:string/privacy_controls_summary"
+                searchTerms="@com.android.safetycenter.resources:string/privacy_controls_search_terms"/>
             <dynamic-safety-source
                 id="AndroidPrivacyAppDataSharingUpdates"
                 packageName="com.android.permissioncontroller"
@@ -79,13 +86,6 @@
                 refreshOnPageOpenAllowed="true"
                 title="@com.android.safetycenter.resources:string/app_data_sharing_updates_title"
                 searchTerms="@com.android.safetycenter.resources:string/app_data_sharing_updates_search_terms"/>
-            <static-safety-source
-                id="AndroidHealthConnect"
-                profile="primary_profile_only"
-                intentAction="android.health.connect.action.HEALTH_HOME_SETTINGS"
-                title="@com.android.safetycenter.resources:string/health_connect_title"
-                summary="@com.android.safetycenter.resources:string/health_connect_summary"
-                searchTerms="@com.android.safetycenter.resources:string/health_connect_search_terms"/>
             <issue-only-safety-source
                 id="AndroidAccessibility"
                 packageName="com.android.permissioncontroller"
diff --git a/SafetyCenter/Resources/res/values-v34/strings.xml b/SafetyCenter/Resources/res/values-v34/strings.xml
index f3db7632a..e3c411f22 100644
--- a/SafetyCenter/Resources/res/values-v34/strings.xml
+++ b/SafetyCenter/Resources/res/values-v34/strings.xml
@@ -22,7 +22,7 @@
   <string name="health_connect_search_terms" description="Health connect search words">Health, Health Connect</string>
   <string name="app_data_sharing_updates_title" description="App data sharing updates title">Data sharing updates</string>
   <string name="app_data_sharing_updates_search_terms" description="App data sharing updates search words">Data, Data sharing, Data sharing updates, sharing</string>
-  <string name="ads_privacy_title" description="Ads privacy setting title">Ad privacy</string>
+  <string name="ads_privacy_title" description="Ads privacy setting title">Ads privacy</string>
   <string name="ads_privacy_summary" description="Ads privacy setting summary">Customize info apps use to show you ads</string>
   <string name="ads_privacy_search_terms" description="Search keywords of the Ads privacy setting">ads, ad privacy, privacy sandbox, ad topics, app-suggested ads, ad measurement</string>
   <string name="biometrics_title_for_work" description="The default title of the setting for managing biometric options on the device for work apps">Biometrics for work</string>