Create MoreSecurtiyPrivacyFragment
Created a new MoreSecurityPrivacyFragment, a new
more_security_privacy_settings xml.
This more_security_privacy_settings xml is a created by merging
privacy_advanced_settings.xml and security_advanced_settings.xml and the
MoreSecurityPrivacyFragment is created by merging
PrivacyDashboardFragment and SecurityAdvancedSettings fragments.
Test: adb shell am start -a com.android.settings.security.MORE_SECURITY_PRIVACY_SETTINGS
Bug: b/261557620
Change-Id: I8729f4eaf25a31f91354383e7b6cb5e0fc7df976
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 0c58fff..f9671b0 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -209,6 +209,8 @@
}
/** 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 */ }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 5d80193..708f317 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -165,6 +165,7 @@
import com.android.settings.privacy.PrivacyControlsFragment;
import com.android.settings.privacy.PrivacyDashboardFragment;
import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;
+import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;
import com.android.settings.security.LockscreenDashboardFragment;
import com.android.settings.security.MemtagPage;
import com.android.settings.security.SecurityAdvancedSettings;
@@ -240,6 +241,7 @@
LocationServices.class.getName(),
SecuritySettings.class.getName(),
SecurityAdvancedSettings.class.getName(),
+ MoreSecurityPrivacyFragment.class.getName(),
UsageAccessDetails.class.getName(),
PrivacySettings.class.getName(),
DeviceAdminSettings.class.getName(),
diff --git a/src/com/android/settings/privacy/PrivacyDashboardFragment.java b/src/com/android/settings/privacy/PrivacyDashboardFragment.java
index 46a05b0..045405b 100644
--- a/src/com/android/settings/privacy/PrivacyDashboardFragment.java
+++ b/src/com/android/settings/privacy/PrivacyDashboardFragment.java
@@ -16,12 +16,6 @@
package com.android.settings.privacy;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECTED_WORK_AND_PERSONAL_APPS_TITLE;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LOCKED_NOTIFICATION_TITLE;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOTIFICATIONS_SECTION_HEADER;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PRIVACY_POLICY_INFO;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PRIVACY_POLICY_INFO_SUMMARY;
-
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
@@ -32,23 +26,20 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.notification.LockScreenNotificationPreferenceController;
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
+import com.android.settings.safetycenter.SafetyCenterUtils;
+import com.android.settings.safetycenter.SafetyCenterUtils.EnterpriseOverrideString;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@SearchIndexable
public class PrivacyDashboardFragment extends DashboardFragment {
private static final String TAG = "PrivacyDashboardFrag";
- private static final String KEY_LOCK_SCREEN_NOTIFICATIONS = "privacy_lock_screen_notifications";
- private static final String KEY_WORK_PROFILE_CATEGORY =
- "privacy_work_profile_notifications_category";
private static final String KEY_NOTIFICATION_WORK_PROFILE_NOTIFICATIONS =
"privacy_lock_screen_work_profile_notifications";
@@ -65,18 +56,13 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- replaceEnterpriseStringTitle("privacy_lock_screen_work_profile_notifications",
- WORK_PROFILE_LOCKED_NOTIFICATION_TITLE,
- R.string.locked_work_profile_notification_title);
- replaceEnterpriseStringTitle("interact_across_profiles_privacy",
- CONNECTED_WORK_AND_PERSONAL_APPS_TITLE, R.string.interact_across_profiles_title);
- replaceEnterpriseStringTitle("privacy_work_profile_notifications_category",
- WORK_PROFILE_NOTIFICATIONS_SECTION_HEADER, R.string.profile_section_header);
- replaceEnterpriseStringTitle("work_policy_info",
- WORK_PROFILE_PRIVACY_POLICY_INFO, R.string.work_policy_privacy_settings);
- replaceEnterpriseStringSummary("work_policy_info",
- WORK_PROFILE_PRIVACY_POLICY_INFO_SUMMARY,
- R.string.work_policy_privacy_settings_summary);
+ List<EnterpriseOverrideString> privacyOverrideStrings =
+ SafetyCenterUtils.getEnterpriseOverrideStringForPrivacyEntries();
+ for (int i = 0; i < privacyOverrideStrings.size(); i++) {
+ EnterpriseOverrideString overrideString = privacyOverrideStrings.get(i);
+ replaceEnterpriseStringTitle(overrideString.getPreferenceKey(),
+ overrideString.getOverrideKey(), overrideString.getResource());
+ }
}
@Override
@@ -104,26 +90,21 @@
private static List<AbstractPreferenceController> buildPreferenceControllers(
Context context, Lifecycle lifecycle) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- final LockScreenNotificationPreferenceController notificationController =
- new LockScreenNotificationPreferenceController(context,
- KEY_LOCK_SCREEN_NOTIFICATIONS,
- KEY_WORK_PROFILE_CATEGORY,
- KEY_NOTIFICATION_WORK_PROFILE_NOTIFICATIONS);
- if (lifecycle != null) {
- lifecycle.addObserver(notificationController);
- }
- controllers.add(notificationController);
-
- return controllers;
-
+ return SafetyCenterUtils.getControllersForAdvancedPrivacy(context, lifecycle);
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
+ /**
+ * If SafetyCenter is enabled, all of these entries will be in the More Settings
+ * page, and we don't want to index these entries.
+ */
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
+ if (SafetyCenterManagerWrapper.get().isEnabled(context)) {
+ return null;
+ }
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = getPreferenceScreenResId(context);
return Arrays.asList(sir);
diff --git a/src/com/android/settings/safetycenter/MoreSecurityPrivacyFragment.java b/src/com/android/settings/safetycenter/MoreSecurityPrivacyFragment.java
new file mode 100644
index 0000000..95732f4
--- /dev/null
+++ b/src/com/android/settings/safetycenter/MoreSecurityPrivacyFragment.java
@@ -0,0 +1,155 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.safetycenter;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.safetycenter.SafetyCenterUtils.EnterpriseOverrideString;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.security.LockUnificationPreferenceController;
+import com.android.settings.security.trustagent.TrustAgentListPreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An overflow menu for {@code SecuritySettings} containing advanced security and privacy settings.
+ *
+ * <p>This also includes all work-profile related settings.
+ */
+@SearchIndexable
+public class MoreSecurityPrivacyFragment extends DashboardFragment {
+ private static final String TAG = "MoreSecurityPrivacyFragment";
+ private static final String KEY_NOTIFICATION_WORK_PROFILE_NOTIFICATIONS =
+ "privacy_lock_screen_work_profile_notifications";
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.MORE_SECURITY_PRIVACY_SETTINGS;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.more_security_privacy_settings;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ List<EnterpriseOverrideString> privacyOverrideStrings =
+ SafetyCenterUtils.getEnterpriseOverrideStringForPrivacyEntries();
+ for (int i = 0; i < privacyOverrideStrings.size(); i++) {
+ EnterpriseOverrideString overrideString = privacyOverrideStrings.get(i);
+ replaceEnterpriseStringTitle(overrideString.getPreferenceKey(),
+ overrideString.getOverrideKey(), overrideString.getResource());
+ }
+ List<EnterpriseOverrideString> securityOverrideStrings =
+ SafetyCenterUtils.getEnterpriseOverrideStringForSecurityEntries();
+ for (int i = 0; i < securityOverrideStrings.size(); i++) {
+ EnterpriseOverrideString overrideString = securityOverrideStrings.get(i);
+ replaceEnterpriseStringTitle(overrideString.getPreferenceKey(),
+ overrideString.getOverrideKey(), overrideString.getResource());
+ }
+ }
+
+ /**
+ * see confirmPatternThenDisableAndClear
+ */
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (use(TrustAgentListPreferenceController.class)
+ .handleActivityResult(requestCode, resultCode)) {
+ return;
+ }
+ if (use(LockUnificationPreferenceController.class)
+ .handleActivityResult(requestCode, resultCode, data)) {
+ return;
+ }
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+
+ @Override
+ protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context, getSettingsLifecycle(), this /* host*/);
+ }
+
+ private static List<AbstractPreferenceController> buildPreferenceControllers(
+ Context context, Lifecycle lifecycle, DashboardFragment host) {
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ controllers.addAll(SafetyCenterUtils.getControllersForAdvancedPrivacy(context, lifecycle));
+ controllers.addAll(
+ SafetyCenterUtils.getControllersForAdvancedSecurity(context, lifecycle, host));
+ return controllers;
+
+ }
+
+
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.more_security_privacy_settings) {
+ /**
+ * If SafetyCenter is disabled, all of these entries will be in the More Security
+ * Settings and the Privacy page, and we don't want to index these entries.
+ */
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(
+ Context context, boolean enabled) {
+ if (!SafetyCenterManagerWrapper.get().isEnabled(context)) {
+ return null;
+ }
+ return super.getXmlResourcesToIndex(context, enabled);
+ }
+
+ @Override
+ public List<AbstractPreferenceController> createPreferenceControllers(
+ Context context) {
+ return buildPreferenceControllers(context, null, null);
+ }
+
+ @Override
+ public List<String> getNonIndexableKeys(Context context) {
+ final List<String> keys = super.getNonIndexableKeys(context);
+ final int profileUserId =
+ Utils.getManagedProfileId(
+ UserManager.get(context), UserHandle.myUserId());
+ // If work profile is supported, we should keep the search result.
+ if (profileUserId != UserHandle.USER_NULL) {
+ return keys;
+ }
+
+ // Otherwise, we should hide the search result.
+ keys.add(KEY_NOTIFICATION_WORK_PROFILE_NOTIFICATIONS);
+ return keys;
+ }
+ };
+}
diff --git a/src/com/android/settings/safetycenter/SafetyCenterUtils.java b/src/com/android/settings/safetycenter/SafetyCenterUtils.java
new file mode 100644
index 0000000..6c7967d
--- /dev/null
+++ b/src/com/android/settings/safetycenter/SafetyCenterUtils.java
@@ -0,0 +1,191 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.safetycenter;
+
+import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECTED_WORK_AND_PERSONAL_APPS_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.FINGERPRINT_FOR_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGED_DEVICE_INFO;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGE_DEVICE_ADMIN_APPS;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LOCKED_NOTIFICATION_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOTIFICATIONS_SECTION_HEADER;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PRIVACY_POLICY_INFO;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PRIVACY_POLICY_INFO_SUMMARY;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SECURITY_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SET_UNLOCK_LAUNCH_PICKER_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_UNIFY_LOCKS_SUMMARY;
+
+import android.annotation.StringRes;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.biometrics.combination.CombinedBiometricProfileStatusPreferenceController;
+import com.android.settings.biometrics.face.FaceProfileStatusPreferenceController;
+import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.notification.LockScreenNotificationPreferenceController;
+import com.android.settings.privacy.PrivacyDashboardFragment;
+import com.android.settings.security.ChangeProfileScreenLockPreferenceController;
+import com.android.settings.security.LockUnificationPreferenceController;
+import com.android.settings.security.VisiblePatternProfilePreferenceController;
+import com.android.settings.security.trustagent.TrustAgentListPreferenceController;
+import com.android.settings.widget.PreferenceCategoryController;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A class with helper method used in logic involving safety center.
+ */
+public final class SafetyCenterUtils {
+
+ /**
+ * Returns preference controllers related to advanced security entries.
+ * This is used in {@link MoreSecurityPrivacyFragment} and
+ * {@link com.android.settings.security.SecurityAdvancedSettings}.
+ */
+ public static List<AbstractPreferenceController> getControllersForAdvancedSecurity(
+ Context context,
+ com.android.settingslib.core.lifecycle.Lifecycle lifecycle, DashboardFragment host) {
+ final String WORK_PROFILE_SECURITY_CATEGORY = "work_profile_category";
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ controllers.add(new TrustAgentListPreferenceController(context, host, lifecycle));
+
+ final List<AbstractPreferenceController> profileSecurityControllers = new ArrayList<>();
+ profileSecurityControllers.add(new ChangeProfileScreenLockPreferenceController(
+ context, host));
+ profileSecurityControllers.add(new LockUnificationPreferenceController(context, host));
+ profileSecurityControllers.add(new VisiblePatternProfilePreferenceController(
+ context, lifecycle));
+ profileSecurityControllers.add(new FaceProfileStatusPreferenceController(
+ context, lifecycle));
+ profileSecurityControllers.add(new FingerprintProfileStatusPreferenceController(
+ context, lifecycle));
+ profileSecurityControllers
+ .add(new CombinedBiometricProfileStatusPreferenceController(context, lifecycle));
+ controllers.add(new PreferenceCategoryController(context, WORK_PROFILE_SECURITY_CATEGORY)
+ .setChildren(profileSecurityControllers));
+ controllers.addAll(profileSecurityControllers);
+ return controllers;
+ }
+
+ /**
+ * Returns preference controllers for advanced privacy entries.
+ * This is used in {@link MoreSecurityPrivacyFragment} and {@link PrivacyDashboardFragment}.
+ */
+ public static List<AbstractPreferenceController> getControllersForAdvancedPrivacy(
+ Context context, com.android.settingslib.core.lifecycle.Lifecycle lifecycle) {
+ final String KEY_LOCK_SCREEN_NOTIFICATIONS = "privacy_lock_screen_notifications";
+ final String KEY_WORK_PROFILE_CATEGORY =
+ "privacy_work_profile_notifications_category";
+ final String KEY_NOTIFICATION_WORK_PROFILE_NOTIFICATIONS =
+ "privacy_lock_screen_work_profile_notifications";
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ final LockScreenNotificationPreferenceController notificationController =
+ new LockScreenNotificationPreferenceController(context,
+ KEY_LOCK_SCREEN_NOTIFICATIONS,
+ KEY_WORK_PROFILE_CATEGORY,
+ KEY_NOTIFICATION_WORK_PROFILE_NOTIFICATIONS);
+ if (lifecycle != null) {
+ lifecycle.addObserver(notificationController);
+ }
+ controllers.add(notificationController);
+ return controllers;
+ }
+
+ /**
+ * A class that stores the resource that will be overridden using preferenceKey and overrideKey.
+ */
+ public static final class EnterpriseOverrideString {
+ private final String mPreferenceKey;
+ private final String mOverrideKey;
+ @StringRes private final int mResource;
+
+ public EnterpriseOverrideString(
+ String preferenceKey,
+ String overrideKey,
+ @StringRes int resource) {
+ this.mPreferenceKey = preferenceKey;
+ this.mOverrideKey = overrideKey;
+ this.mResource = resource;
+ }
+
+ @StringRes
+ public int getResource() {
+ return mResource;
+ }
+
+ public String getPreferenceKey() {
+ return mPreferenceKey;
+ }
+
+ public String getOverrideKey() {
+ return mOverrideKey;
+ }
+ }
+
+ /**
+ * Returns a list of @{EnterpriseOverrideString} for the privacy entries.
+ */
+ public static List<EnterpriseOverrideString> getEnterpriseOverrideStringForPrivacyEntries() {
+ List<EnterpriseOverrideString> enterpriseOverrideStrings = new ArrayList<>();
+ enterpriseOverrideStrings.add(
+ new EnterpriseOverrideString("privacy_lock_screen_work_profile_notifications",
+ WORK_PROFILE_LOCKED_NOTIFICATION_TITLE,
+ R.string.locked_work_profile_notification_title));
+ enterpriseOverrideStrings.add(
+ new EnterpriseOverrideString("interact_across_profiles_privacy",
+ CONNECTED_WORK_AND_PERSONAL_APPS_TITLE,
+ R.string.interact_across_profiles_title));
+ enterpriseOverrideStrings.add(
+ new EnterpriseOverrideString("privacy_work_profile_notifications_category",
+ WORK_PROFILE_NOTIFICATIONS_SECTION_HEADER,
+ R.string.profile_section_header));
+ enterpriseOverrideStrings.add(new EnterpriseOverrideString("work_policy_info",
+ WORK_PROFILE_PRIVACY_POLICY_INFO, R.string.work_policy_privacy_settings));
+ enterpriseOverrideStrings.add(new EnterpriseOverrideString("work_policy_info",
+ WORK_PROFILE_PRIVACY_POLICY_INFO_SUMMARY,
+ R.string.work_policy_privacy_settings_summary));
+ return enterpriseOverrideStrings;
+ }
+
+ /**
+ * Returns a list of @{EnterpriseOverrideString} for the security entries.
+ */
+ public static List<EnterpriseOverrideString> getEnterpriseOverrideStringForSecurityEntries() {
+ List<EnterpriseOverrideString> enterpriseOverrideStrings = new ArrayList<>();
+ enterpriseOverrideStrings.add(new EnterpriseOverrideString("unlock_set_or_change_profile",
+ WORK_PROFILE_SET_UNLOCK_LAUNCH_PICKER_TITLE,
+ R.string.unlock_set_unlock_launch_picker_title_profile));
+ enterpriseOverrideStrings.add(new EnterpriseOverrideString("unification",
+ WORK_PROFILE_UNIFY_LOCKS_SUMMARY,
+ R.string.lock_settings_profile_unification_summary));
+ enterpriseOverrideStrings.add(new EnterpriseOverrideString("fingerprint_settings_profile",
+ FINGERPRINT_FOR_WORK,
+ R.string.security_settings_work_fingerprint_preference_title));
+ enterpriseOverrideStrings.add(new EnterpriseOverrideString("manage_device_admin",
+ MANAGE_DEVICE_ADMIN_APPS, R.string.manage_device_admin));
+ enterpriseOverrideStrings.add(new EnterpriseOverrideString("security_category_profile",
+ WORK_PROFILE_SECURITY_TITLE, R.string.lock_settings_profile_title));
+ enterpriseOverrideStrings.add(
+ new EnterpriseOverrideString("enterprise_privacy", MANAGED_DEVICE_INFO,
+ R.string.enterprise_privacy_settings));
+ return enterpriseOverrideStrings;
+ }
+
+ private SafetyCenterUtils() {}
+}
diff --git a/src/com/android/settings/security/SecurityAdvancedSettings.java b/src/com/android/settings/security/SecurityAdvancedSettings.java
index f716064..b2b2782 100644
--- a/src/com/android/settings/security/SecurityAdvancedSettings.java
+++ b/src/com/android/settings/security/SecurityAdvancedSettings.java
@@ -16,34 +16,25 @@
package com.android.settings.security;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.FINGERPRINT_FOR_WORK;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGED_DEVICE_INFO;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGE_DEVICE_ADMIN_APPS;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SECURITY_TITLE;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SET_UNLOCK_LAUNCH_PICKER_TITLE;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_UNIFY_LOCKS_SUMMARY;
-
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.provider.SearchIndexableResource;
import com.android.settings.R;
-import com.android.settings.biometrics.combination.CombinedBiometricProfileStatusPreferenceController;
-import com.android.settings.biometrics.face.FaceProfileStatusPreferenceController;
-import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
+import com.android.settings.safetycenter.SafetyCenterUtils;
+import com.android.settings.safetycenter.SafetyCenterUtils.EnterpriseOverrideString;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.trustagent.TrustAgentListPreferenceController;
-import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.search.SearchIndexable;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -55,7 +46,6 @@
public class SecurityAdvancedSettings extends DashboardFragment {
private static final String TAG = "SecurityAdvancedSettings";
- private static final String WORK_PROFILE_SECURITY_CATEGORY = "security_category_profile";
/** Used in case of old Security settings when SafetyCenter is disabled */
private static final String CATEGORY_SECURITY_LEGACY_ADVANCED_SETTINGS =
@@ -64,22 +54,13 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- replaceEnterpriseStringTitle("unlock_set_or_change_profile",
- WORK_PROFILE_SET_UNLOCK_LAUNCH_PICKER_TITLE,
- R.string.unlock_set_unlock_launch_picker_title_profile);
- replaceEnterpriseStringSummary("unification",
- WORK_PROFILE_UNIFY_LOCKS_SUMMARY,
- R.string.lock_settings_profile_unification_summary);
- replaceEnterpriseStringTitle("fingerprint_settings_profile",
- FINGERPRINT_FOR_WORK,
- R.string.security_settings_work_fingerprint_preference_title);
- replaceEnterpriseStringTitle("manage_device_admin",
- MANAGE_DEVICE_ADMIN_APPS, R.string.manage_device_admin);
- replaceEnterpriseStringTitle("security_category_profile",
- WORK_PROFILE_SECURITY_TITLE, R.string.lock_settings_profile_title);
- replaceEnterpriseStringTitle("enterprise_privacy", MANAGED_DEVICE_INFO,
- R.string.enterprise_privacy_settings);
-
+ List<EnterpriseOverrideString> securityOverrideStrings =
+ SafetyCenterUtils.getEnterpriseOverrideStringForSecurityEntries();
+ for (int i = 0; i < securityOverrideStrings.size(); i++) {
+ EnterpriseOverrideString overrideString = securityOverrideStrings.get(i);
+ replaceEnterpriseStringTitle(overrideString.getPreferenceKey(),
+ overrideString.getOverrideKey(), overrideString.getResource());
+ }
}
@Override
@@ -140,26 +121,7 @@
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, DashboardFragment host) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new TrustAgentListPreferenceController(context, host, lifecycle));
-
- final List<AbstractPreferenceController> profileSecurityControllers = new ArrayList<>();
- profileSecurityControllers.add(new ChangeProfileScreenLockPreferenceController(
- context, host));
- profileSecurityControllers.add(new LockUnificationPreferenceController(context, host));
- profileSecurityControllers.add(new VisiblePatternProfilePreferenceController(
- context, lifecycle));
- profileSecurityControllers.add(new FaceProfileStatusPreferenceController(
- context, lifecycle));
- profileSecurityControllers.add(new FingerprintProfileStatusPreferenceController(
- context, lifecycle));
- profileSecurityControllers
- .add(new CombinedBiometricProfileStatusPreferenceController(context, lifecycle));
- controllers.add(new PreferenceCategoryController(context, WORK_PROFILE_SECURITY_CATEGORY)
- .setChildren(profileSecurityControllers));
- controllers.addAll(profileSecurityControllers);
-
- return controllers;
+ return SafetyCenterUtils.getControllersForAdvancedSecurity(context, lifecycle, host);
}
/**
@@ -167,6 +129,18 @@
*/
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.security_advanced_settings) {
+ /**
+ * If SafetyCenter is enabled, all of these entries will be in the More Settings
+ * page, and we don't want to index these entries.
+ */
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ if (SafetyCenterManagerWrapper.get().isEnabled(context)) {
+ return null;
+ }
+ return super.getXmlResourcesToIndex(context, enabled);
+ }
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context