From f0bd2d38d46fb7f6a80f0ffa42fc34e4388b096a Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Mon, 8 Jul 2024 16:46:06 +0000
Subject: [PATCH] Fix the wording order of personal and work are different in
 the device unlock settings

Change the wording order of Face and Fingerprint for work profile.

Flag: EXEMPT bugfix

Bug: 342356302

Test: Build ABTD ROM and check the wording order of Face and
Fingerprint for work profile.

Change-Id: I7e68bfcb411f70d6dd9a2a2f7d3a6a976bb9dacf
---
 res/xml/security_advanced_settings.xml             |  8 ++++----
 ...ecurity_settings_combined_biometric_profile.xml | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml
index c220e99b483..f1556d61901 100644
--- a/res/xml/security_advanced_settings.xml
+++ b/res/xml/security_advanced_settings.xml
@@ -140,13 +140,13 @@
             settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
 
         <com.android.settingslib.RestrictedPreference
-            android:key="fingerprint_settings_profile"
-            android:title="@string/security_settings_work_fingerprint_preference_title"
+            android:key="face_settings_profile"
+            android:title="@string/security_settings_face_profile_preference_title"
             android:summary="@string/summary_placeholder" />
 
         <com.android.settingslib.RestrictedPreference
-            android:key="face_settings_profile"
-            android:title="@string/security_settings_face_profile_preference_title"
+            android:key="fingerprint_settings_profile"
+            android:title="@string/security_settings_work_fingerprint_preference_title"
             android:summary="@string/summary_placeholder" />
 
         <com.android.settingslib.RestrictedPreference
diff --git a/res/xml/security_settings_combined_biometric_profile.xml b/res/xml/security_settings_combined_biometric_profile.xml
index 1ab4106afff..42078f54c3b 100644
--- a/res/xml/security_settings_combined_biometric_profile.xml
+++ b/res/xml/security_settings_combined_biometric_profile.xml
@@ -26,13 +26,6 @@
         android:key="biometric_ways_to_unlock"
         android:title="@string/biometric_settings_category_ways_to_unlock">
 
-        <com.android.settingslib.RestrictedPreference
-            android:key="biometric_fingerprint_settings_profile"
-            android:title="@string/security_settings_work_fingerprint_preference_title"
-            android:summary="@string/summary_placeholder"
-            settings:keywords="@string/keywords_fingerprint_settings"
-            settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
-
         <com.android.settingslib.RestrictedPreference
             android:key="biometric_face_settings_profile"
             android:title="@string/security_settings_face_profile_preference_title"
@@ -40,6 +33,13 @@
             settings:keywords="@string/keywords_face_settings"
             settings:controller="com.android.settings.biometrics.combination.BiometricFaceProfileStatusPreferenceController" />
 
+        <com.android.settingslib.RestrictedPreference
+            android:key="biometric_fingerprint_settings_profile"
+            android:title="@string/security_settings_work_fingerprint_preference_title"
+            android:summary="@string/summary_placeholder"
+            settings:keywords="@string/keywords_fingerprint_settings"
+            settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
+
     </PreferenceCategory>
 
     <PreferenceCategory