Merge "Group some Security settings to a separate "Advanced settings" screen" (b67f0974) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+13 −0

Original line number	Diff line number	Diff line
		@@ -1675,6 +1675,19 @@
		android:value="true" />
		</activity>

		<activity
		android:name="Settings$SecurityAdvancedSettings"
		android:label="@string/security_advanced_settings"
		android:exported="true"
		android:icon="@drawable/ic_settings_security">
		<intent-filter android:priority="1">
		<action android:name="com.android.settings.security.SECURITY_ADVANCED_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.security.SecurityAdvancedSettings" />
		</activity>

		<activity android:name="MonitoringCertInfoActivity"
		android:label=""
		android:theme="@style/Transparent"

res/values/strings.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -1244,6 +1244,15 @@
		<string name="security_settings_fingerprint_enroll_lift_touch_again">Lift finger, then touch sensor again</string>
		<!-- Text shown during fingerprint enrollment to indicate bad sensor calibration. [CHAR LIMIT=100] -->
		<string name="security_settings_fingerprint_bad_calibration">Can\u2019t use fingerprint sensor. Visit a repair provider</string>
		<!-- Title for Advanced Security Settings [CHAR LIMIT=60] -->
		<string name="security_advanced_settings">Advanced settings</string>
		<!-- String for summary to be shown in Advanced settings tile in Security page, when there is a work profile set up on the device. Smart Lock is a brand name. [CHAR_LIMIT=NONE] -->
		<string name="security_advanced_settings_work_profile_settings_summary">Work profile lock, Smart Lock</string>
		<!-- String for summary to be shown in Advanced settings tile in Security page, when there is no work profile set up on the device. Smart Lock is a brand name. [CHAR_LIMIT=NONE] -->
		<string name="security_advanced_settings_no_work_profile_settings_summary">Smart Lock and more</string>
		<!-- Search keywords for Advanced settings in Security page. [CHAR_LIMIT=NONE] -->
		<string name="security_advanced_settings_keywords">Advanced settings</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>

res/xml/security_advanced_settings.xml

0 → 100644

+141 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2021 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:title="@string/security_advanced_settings">

		<PreferenceCategory
		android:order="1"
		android:key="dashboard_title_placeholder" />

		<!-- Main security section - for trust agents added in code. -->
		<PreferenceCategory
		android:order="10"
		android:key="security_category" />

		<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" />

		<Preference
		android:key="financed_privacy"
		android:title="@string/financed_privacy_settings"
		android:summary="@string/summary_placeholder"
		android:fragment="com.android.settings.enterprise.EnterprisePrivacySettings" />

		</PreferenceCategory>

		<Preference
		android:order="50"
		android:key="sim_lock_settings"
		android:title="@string/sim_lock_settings_category">

		<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" />

		<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" />

		<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" />

		<SwitchPreference
		android:order="90"
		android:key="confirm_sim_deletion"
		android:title="@string/confirm_sim_deletion_title"
		android:summary="@string/confirm_sim_deletion_description"
		settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController"/>

		<!-- work profile security section -->
		<PreferenceCategory
		android:order="100"
		android:key="security_category_profile"
		android:title="@string/lock_settings_profile_title">

		<!-- 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>

		</PreferenceScreen>

res/xml/security_dashboard_settings.xml

+6 −105

Original line number	Diff line number	Diff line
		@@ -62,112 +62,13 @@
		settings:keywords="@string/keywords_biometric_settings" />
		</PreferenceCategory>

		<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" />

		<Preference
		android:key="financed_privacy"
		android:title="@string/financed_privacy_settings"
		android:summary="@string/summary_placeholder"
		android:fragment="com.android.settings.enterprise.EnterprisePrivacySettings" />

		</PreferenceCategory>

		<Preference
		android:order="50"
		android:key="sim_lock_settings"
		android:title="@string/sim_lock_settings_category">

		<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" />

		<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" />

		<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" />

		<SwitchPreference
		android:order="90"
		android:key="confirm_sim_deletion"
		android:title="@string/confirm_sim_deletion_title"
		android:summary="@string/confirm_sim_deletion_description"
		settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController"/>

		<!-- work profile security section -->
		<PreferenceCategory
		android:order="100"
		android:key="security_category_profile"
		android:title="@string/lock_settings_profile_title">

		<!-- 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"
		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: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>
		android:key="security_advanced_settings"
		android:title="@string/security_advanced_settings"
		android:summary="@string/summary_placeholder"
		android:fragment="com.android.settings.security.SecurityAdvancedSettings"
		settings:controller="com.android.settings.security.SecurityAdvancedSettingsController"
		settings:keywords="@string/security_advanced_settings_keywords" />

		</PreferenceScreen>
		No newline at end of file

src/com/android/settings/Settings.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,8 @@ public class Settings extends SettingsActivity {
		return alternativeFragmentClassname;
		}
		}
		/** Activity for the Advanced security settings. */
		public static class SecurityAdvancedSettings extends SettingsActivity { /* empty */ }
		public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
		public static class AppUsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
		public static class LocationSettingsActivity extends SettingsActivity { /* empty */ }