Loading AndroidManifest.xml +14 −0 Original line number Diff line number Diff line Loading @@ -1875,6 +1875,20 @@ android:value="@string/menu_key_security"/> </activity> <activity android:name="Settings$MoreSecurityPrivacySettingsActivity" android:label="@string/more_security_privacy_settings" android:exported="true"> <intent-filter android:priority="1"> <action android:name="com.android.settings.MORE_SECURITY_PRIVACY_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.safetycenter.MoreSecurityPrivacyFragment" /> <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY" android:value="@string/menu_key_safety_center"/> </activity> <activity android:name="MonitoringCertInfoActivity" android:label="" android:theme="@style/Transparent" Loading res/values/strings.xml +9 −0 Original line number Diff line number Diff line Loading @@ -1022,6 +1022,15 @@ <!-- Title for the section that has additional privacy settings. [CHAR LIMIT=60] --> <string name="privacy_advanced_settings">More privacy settings</string> <!-- Title for the subpage in the "Security & privacy". This page consists of the more security and privacy settings. Can be navigated by Settings -> Security & privacy -> More Settings [CHAR LIMIT=NONE] --> <string name="more_security_privacy_settings">More settings</string> <!-- Title for the section that has security entries in the More Settings page. [CHAR LIMIT=60] --> <string name="security_header">Security</string> <!-- Title for the section that has privacy entries in the More Settings page. [CHAR LIMIT=60] --> <string name="privacy_header">Privacy</string> <!-- Title for the section that has work profile entries in the More Settings page. [CHAR LIMIT=60] --> <string name="work_profile_category_header">Work profile</string> <!-- Text shown when "Add fingerprint" button is disabled --> <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string> <!-- Text shown when users has enrolled a maximum number of fingerprints [CHAR LIMIT=NONE] --> Loading res/xml/more_security_privacy_settings.xml 0 → 100644 +227 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2023 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res-auto" android:key="more_security_privacy_settings" 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 --> <PreferenceCategory android:order="10" android:key="work_profile_category" android:title="@string/work_profile_category_header"> <!-- security_settings_unification --> <com.android.settingslib.RestrictedSwitchPreference android:key="unification" android:title="@string/lock_settings_profile_unification_title" android:summary="@string/lock_settings_profile_unification_summary" settings:keywords="@string/keywords_unification" /> <com.android.settingslib.RestrictedPreference android:key="unlock_set_or_change_profile" android:title="@string/unlock_set_unlock_launch_picker_title_profile" android:summary="@string/unlock_set_unlock_mode_pattern" settings:keywords="@string/keywords_lockscreen" /> <SwitchPreference 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_preference_title" android:summary="@string/summary_placeholder" /> <com.android.settingslib.RestrictedPreference android:key="biometric_settings_profile" android:title="@string/security_settings_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"> <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="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 --> <PreferenceCategory android:order="200" android:key="privacy_category" android:title="@string/privacy_header"> <!-- Accessibility usage --> <Preference android:key="privacy_accessibility_usage" android:title="@string/accessibility_usage_title" settings:controller="com.android.settings.privacy.AccessibilityUsagePreferenceController"> <intent android:action="android.intent.action.REVIEW_ACCESSIBILITY_SERVICES"/> </Preference> <!-- On lock screen notifications --> <com.android.settings.RestrictedListPreference android:key="privacy_lock_screen_notifications" android:title="@string/lock_screen_notifs_title" android:summary="@string/summary_placeholder" settings:searchable="false"/> <!-- Show media on lock screen --> <SwitchPreference android:key="privacy_media_controls_lockscreen" android:title="@string/media_controls_lockscreen_title" android:summary="@string/media_controls_lockscreen_description" settings:controller= "com.android.settings.sound.MediaControlsLockScreenPreferenceController" /> <!-- Content Capture --> <!-- NOTE: content capture has a different preference, depending whether or not the ContentCaptureService implementations defines a custom settings activitiy on its manifest. Hence, we show both here, but the controller itself will decide if it's available or not. --> <SwitchPreference android:key="content_capture" android:title="@string/content_capture" android:summary="@string/content_capture_summary" settings:controller="com.android.settings.privacy.EnableContentCapturePreferenceController"/> <com.android.settingslib.PrimarySwitchPreference android:key="content_capture_custom_settings" android:title="@string/content_capture" android:summary="@string/content_capture_summary" settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController"/> </PreferenceCategory> </PreferenceScreen> No newline at end of file res/xml/security_advanced_settings.xml +1 −1 Original line number Diff line number Diff line Loading @@ -110,7 +110,7 @@ <!-- work profile security section --> <PreferenceCategory android:order="110" android:key="security_category_profile" android:key="work_profile_category" android:title="@string/lock_settings_profile_title"> <!-- security_settings_unification --> Loading src/com/android/settings/Settings.java +2 −0 Original line number Diff line number Diff line Loading @@ -209,6 +209,8 @@ public class Settings extends SettingsActivity { } /** Activity for the Advanced security settings. */ public static class SecurityAdvancedSettings extends SettingsActivity { /* empty */ } /** Activity for the More settings page. */ public static class MoreSecurityPrivacySettingsActivity extends SettingsActivity { /* empty */ } public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ } public static class AppUsageAccessSettingsActivity extends SettingsActivity { /* empty */ } public static class LocationSettingsActivity extends SettingsActivity { /* empty */ } Loading Loading
AndroidManifest.xml +14 −0 Original line number Diff line number Diff line Loading @@ -1875,6 +1875,20 @@ android:value="@string/menu_key_security"/> </activity> <activity android:name="Settings$MoreSecurityPrivacySettingsActivity" android:label="@string/more_security_privacy_settings" android:exported="true"> <intent-filter android:priority="1"> <action android:name="com.android.settings.MORE_SECURITY_PRIVACY_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.safetycenter.MoreSecurityPrivacyFragment" /> <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY" android:value="@string/menu_key_safety_center"/> </activity> <activity android:name="MonitoringCertInfoActivity" android:label="" android:theme="@style/Transparent" Loading
res/values/strings.xml +9 −0 Original line number Diff line number Diff line Loading @@ -1022,6 +1022,15 @@ <!-- Title for the section that has additional privacy settings. [CHAR LIMIT=60] --> <string name="privacy_advanced_settings">More privacy settings</string> <!-- Title for the subpage in the "Security & privacy". This page consists of the more security and privacy settings. Can be navigated by Settings -> Security & privacy -> More Settings [CHAR LIMIT=NONE] --> <string name="more_security_privacy_settings">More settings</string> <!-- Title for the section that has security entries in the More Settings page. [CHAR LIMIT=60] --> <string name="security_header">Security</string> <!-- Title for the section that has privacy entries in the More Settings page. [CHAR LIMIT=60] --> <string name="privacy_header">Privacy</string> <!-- Title for the section that has work profile entries in the More Settings page. [CHAR LIMIT=60] --> <string name="work_profile_category_header">Work profile</string> <!-- Text shown when "Add fingerprint" button is disabled --> <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string> <!-- Text shown when users has enrolled a maximum number of fingerprints [CHAR LIMIT=NONE] --> Loading
res/xml/more_security_privacy_settings.xml 0 → 100644 +227 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2023 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res-auto" android:key="more_security_privacy_settings" 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 --> <PreferenceCategory android:order="10" android:key="work_profile_category" android:title="@string/work_profile_category_header"> <!-- security_settings_unification --> <com.android.settingslib.RestrictedSwitchPreference android:key="unification" android:title="@string/lock_settings_profile_unification_title" android:summary="@string/lock_settings_profile_unification_summary" settings:keywords="@string/keywords_unification" /> <com.android.settingslib.RestrictedPreference android:key="unlock_set_or_change_profile" android:title="@string/unlock_set_unlock_launch_picker_title_profile" android:summary="@string/unlock_set_unlock_mode_pattern" settings:keywords="@string/keywords_lockscreen" /> <SwitchPreference 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_preference_title" android:summary="@string/summary_placeholder" /> <com.android.settingslib.RestrictedPreference android:key="biometric_settings_profile" android:title="@string/security_settings_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"> <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="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 --> <PreferenceCategory android:order="200" android:key="privacy_category" android:title="@string/privacy_header"> <!-- Accessibility usage --> <Preference android:key="privacy_accessibility_usage" android:title="@string/accessibility_usage_title" settings:controller="com.android.settings.privacy.AccessibilityUsagePreferenceController"> <intent android:action="android.intent.action.REVIEW_ACCESSIBILITY_SERVICES"/> </Preference> <!-- On lock screen notifications --> <com.android.settings.RestrictedListPreference android:key="privacy_lock_screen_notifications" android:title="@string/lock_screen_notifs_title" android:summary="@string/summary_placeholder" settings:searchable="false"/> <!-- Show media on lock screen --> <SwitchPreference android:key="privacy_media_controls_lockscreen" android:title="@string/media_controls_lockscreen_title" android:summary="@string/media_controls_lockscreen_description" settings:controller= "com.android.settings.sound.MediaControlsLockScreenPreferenceController" /> <!-- Content Capture --> <!-- NOTE: content capture has a different preference, depending whether or not the ContentCaptureService implementations defines a custom settings activitiy on its manifest. Hence, we show both here, but the controller itself will decide if it's available or not. --> <SwitchPreference android:key="content_capture" android:title="@string/content_capture" android:summary="@string/content_capture_summary" settings:controller="com.android.settings.privacy.EnableContentCapturePreferenceController"/> <com.android.settingslib.PrimarySwitchPreference android:key="content_capture_custom_settings" android:title="@string/content_capture" android:summary="@string/content_capture_summary" settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController"/> </PreferenceCategory> </PreferenceScreen> No newline at end of file
res/xml/security_advanced_settings.xml +1 −1 Original line number Diff line number Diff line Loading @@ -110,7 +110,7 @@ <!-- work profile security section --> <PreferenceCategory android:order="110" android:key="security_category_profile" android:key="work_profile_category" android:title="@string/lock_settings_profile_title"> <!-- security_settings_unification --> Loading
src/com/android/settings/Settings.java +2 −0 Original line number Diff line number Diff line Loading @@ -209,6 +209,8 @@ public class Settings extends SettingsActivity { } /** Activity for the Advanced security settings. */ public static class SecurityAdvancedSettings extends SettingsActivity { /* empty */ } /** Activity for the More settings page. */ public static class MoreSecurityPrivacySettingsActivity extends SettingsActivity { /* empty */ } public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ } public static class AppUsageAccessSettingsActivity extends SettingsActivity { /* empty */ } public static class LocationSettingsActivity extends SettingsActivity { /* empty */ } Loading