PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the wording order of personal and work are different in the

Browse Source 
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
This commit is contained in:
Jason Chang
2024-07-08 16:46:06 +00:00
parent 1d838f62ea
commit f0bd2d38d4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/security_advanced_settings.xml
View File

@@ -140,13 +140,13 @@
settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" /> settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="fingerprint_settings_profile" android:key="face_settings_profile"
android:title="@string/security_settings_work_fingerprint_preference_title" android:title="@string/security_settings_face_profile_preference_title"
android:summary="@string/summary_placeholder" /> android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="face_settings_profile" android:key="fingerprint_settings_profile"
android:title="@string/security_settings_face_profile_preference_title" android:title="@string/security_settings_work_fingerprint_preference_title"
android:summary="@string/summary_placeholder" /> android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference

14
res/xml/security_settings_combined_biometric_profile.xml
View File

@@ -26,13 +26,6 @@
android:key="biometric_ways_to_unlock" android:key="biometric_ways_to_unlock"
android:title="@string/biometric_settings_category_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 <com.android.settingslib.RestrictedPreference
android:key="biometric_face_settings_profile" android:key="biometric_face_settings_profile"
android:title="@string/security_settings_face_profile_preference_title" android:title="@string/security_settings_face_profile_preference_title"
@@ -40,6 +33,13 @@
settings:keywords="@string/keywords_face_settings" settings:keywords="@string/keywords_face_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFaceProfileStatusPreferenceController" /> 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>
<PreferenceCategory <PreferenceCategory