Remove biometrics for work from more settings
Biometrics, Face, and Fingerprint for work has been moved to the Privacy
subpage in safety center. This removes them from More Settings to avoid duplication.
Also fixes the ordering of the sections.
Test: manually tested
Bug: b/269079559
Change-Id: Ic8780e03e13c6d87a00f206507805963ba52bd71
diff --git a/res/xml/more_security_privacy_settings.xml b/res/xml/more_security_privacy_settings.xml
index 00957f7..5fce68f 100644
--- a/res/xml/more_security_privacy_settings.xml
+++ b/res/xml/more_security_privacy_settings.xml
@@ -22,9 +22,10 @@
android:title="@string/more_security_privacy_settings">
<!-- work profile security section. See also: security_advanced_settings.xml and
- privacy_advanced_settings.xml. That page also has some duplicate entries -->
+ privacy_advanced_settings.xml. That page also has these same entries.
+ The order is -10 to make sure it is always at the top. -->
<PreferenceCategory
- android:order="10"
+ android:order="-10"
android:key="work_profile_category"
android:title="@string/work_profile_category_header">
@@ -45,141 +46,27 @@
android:key="visiblepattern_profile"
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile" />
- <com.android.settingslib.RestrictedPreference
- android:key="fingerprint_settings_profile"
- android:title="@string/security_settings_work_fingerprint_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:summary="@string/summary_placeholder" />
-
- <com.android.settingslib.RestrictedPreference
- android:key="biometric_settings_profile"
- android:title="@string/security_settings_work_biometric_preference_title"
- android:summary="@string/summary_placeholder" />
-
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="privacy_work_profile_notifications_category"
- android:title="@string/profile_section_header_for_advanced_privacy"
- android:layout="@layout/preference_category_no_label"
- android:order="20">
-
<com.android.settings.RestrictedListPreference
android:key="privacy_lock_screen_work_profile_notifications"
android:title="@string/locked_work_profile_notification_title"
android:summary="@string/summary_placeholder"
- android:order="21"
settings:searchable="false"/>
- </PreferenceCategory>
- <!-- Connected work and personal apps -->
- <Preference
- android:key="interact_across_profiles_privacy"
- android:title="@string/interact_across_profiles_title"
- android:order="25"
- android:fragment="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettings"
- settings:searchable="false"
- settings:controller="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesController" />
-
- <!-- Main security section - for trust agents added in code. -->
- <PreferenceCategory
- android:order="30"
- android:key="security_category"
- android:title="@string/security_header" />
-
- <PreferenceCategory
- android:order="40"
- android:key="security_settings_device_admin_category"
- android:layout="@layout/preference_category_no_label">
-
+ <!-- Connected work and personal apps -->
<Preference
- android:key="manage_device_admin"
- android:title="@string/manage_device_admin"
- android:summary="@string/summary_placeholder"
- android:fragment=
- "com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings"
- settings:controller=
- "com.android.settings.enterprise.ManageDeviceAdminPreferenceController" />
-
- <Preference
- android:key="enterprise_privacy"
- android:title="@string/enterprise_privacy_settings"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.enterprise.EnterprisePrivacySettings"
- settings:controller="com.android.settings.enterprise.EnterprisePrivacyPreferenceController"/>
-
- <Preference
- android:key="financed_privacy"
- android:title="@string/financed_privacy_settings"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.enterprise.EnterprisePrivacySettings"
- settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>
+ android:key="interact_across_profiles_privacy"
+ android:title="@string/interact_across_profiles_title"
+ android:fragment="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettings"
+ settings:searchable="false"
+ settings:controller="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesController" />
</PreferenceCategory>
- <Preference
- android:order="50"
- android:key="sim_lock_settings"
- android:title="@string/sim_lock_settings_category"
- settings:isPreferenceVisible="@bool/config_show_sim_info"
- settings:controller="com.android.settings.security.SimLockPreferenceController">
-
- <intent
- android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.Settings$IccLockSettingsActivity" />
-
- </Preference>
-
- <Preference
- android:order="60"
- android:key="encryption_and_credential"
- android:title="@string/encryption_and_credential_settings_title"
- android:summary="@string/encryption_and_credential_settings_summary"
- android:fragment="com.android.settings.security.EncryptionAndCredential"
- settings:controller="com.android.settings.security.EncryptionStatusPreferenceController" />
-
- <Preference
- android:order="70"
- android:key="manage_trust_agents"
- android:title="@string/manage_trust_agents"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.security.trustagent.TrustAgentSettings"
- settings:controller="com.android.settings.security.trustagent.ManageTrustAgentsPreferenceController" />
-
- <Preference
- android:order="80"
- android:key="screen_pinning_settings"
- android:title="@string/screen_pinning_title"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.security.ScreenPinningSettings"
- settings:keywords="@string/keywords_app_pinning"
- settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />
-
- <SwitchPreference
- android:order="90"
- android:key="confirm_sim_deletion"
- android:title="@string/confirm_sim_deletion_title"
- android:summary="@string/confirm_sim_deletion_description"
- settings:isPreferenceVisible="@bool/config_show_sim_info"
- settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController" />
-
- <Preference
- android:order="100"
- android:id="@+id/memtag_page"
- android:key="memtag_page"
- android:title="@string/memtag_title"
- android:fragment="com.android.settings.security.MemtagPage"
- settings:controller="com.android.settings.security.MemtagPagePreferenceController" />
-
<!-- Privacy section -->
+ <!-- The order is -1 to make sure it is above all the privacy entries. Some dynamically injected entries have order 0. -->
<PreferenceCategory
- android:order="200"
+ android:order="-1"
android:key="privacy_category"
android:title="@string/privacy_header">
<!-- Accessibility usage -->
@@ -224,4 +111,98 @@
</PreferenceCategory>
+ <!-- Security section. -->
+ <!-- "security_category" is used to add trust agents by TrustAgentListPreferenceController -->
+ <PreferenceCategory
+ android:order="200"
+ android:key="security_category"
+ android:title="@string/security_header" />
+
+ <PreferenceCategory
+ android:order="240"
+ android:key="security_settings_device_admin_category"
+ android:layout="@layout/preference_category_no_label">
+
+ <Preference
+ android:key="manage_device_admin"
+ android:title="@string/manage_device_admin"
+ android:summary="@string/summary_placeholder"
+ android:fragment=
+ "com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings"
+ settings:controller=
+ "com.android.settings.enterprise.ManageDeviceAdminPreferenceController" />
+
+ <Preference
+ android:key="enterprise_privacy"
+ android:title="@string/enterprise_privacy_settings"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.enterprise.EnterprisePrivacySettings"
+ settings:controller="com.android.settings.enterprise.EnterprisePrivacyPreferenceController"/>
+
+ <Preference
+ android:key="financed_privacy"
+ android:title="@string/financed_privacy_settings"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.enterprise.EnterprisePrivacySettings"
+ settings:controller="com.android.settings.enterprise.FinancedPrivacyPreferenceController"/>
+
+ </PreferenceCategory>
+
+ <Preference
+ android:order="250"
+ android:key="sim_lock_settings"
+ android:title="@string/sim_lock_settings_category"
+ settings:isPreferenceVisible="@bool/config_show_sim_info"
+ settings:controller="com.android.settings.security.SimLockPreferenceController">
+
+ <intent
+ android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.Settings$IccLockSettingsActivity" />
+
+ </Preference>
+
+ <Preference
+ android:order="260"
+ android:key="encryption_and_credential"
+ android:title="@string/encryption_and_credential_settings_title"
+ android:summary="@string/encryption_and_credential_settings_summary"
+ android:fragment="com.android.settings.security.EncryptionAndCredential"
+ settings:controller="com.android.settings.security.EncryptionStatusPreferenceController" />
+
+ <Preference
+ android:order="270"
+ android:key="manage_trust_agents"
+ android:title="@string/manage_trust_agents"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.security.trustagent.TrustAgentSettings"
+ settings:controller="com.android.settings.security.trustagent.ManageTrustAgentsPreferenceController" />
+
+ <Preference
+ android:order="280"
+ android:key="screen_pinning_settings"
+ android:title="@string/screen_pinning_title"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.security.ScreenPinningSettings"
+ settings:keywords="@string/keywords_app_pinning"
+ settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />
+
+ <SwitchPreference
+ android:order="290"
+ android:key="confirm_sim_deletion"
+ android:title="@string/confirm_sim_deletion_title"
+ android:summary="@string/confirm_sim_deletion_description"
+ settings:isPreferenceVisible="@bool/config_show_sim_info"
+ settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController" />
+
+ <Preference
+ android:order="300"
+ android:id="@+id/memtag_page"
+ android:key="memtag_page"
+ android:title="@string/memtag_title"
+ android:fragment="com.android.settings.security.MemtagPage"
+ settings:controller="com.android.settings.security.MemtagPagePreferenceController" />
+
+
+
</PreferenceScreen>
\ No newline at end of file