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

Merge "Set profile pattern visibility controller in xml" into main

Browse Source
This commit is contained in:
Pavel Grafov
2023-07-13 10:11:48 +00:00
committed by Android (Google) Code Review
parent 07e0e5c86f b758a84e07
commit 735f8ee883
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/more_security_privacy_settings.xml
View File

@@ -44,7 +44,8 @@
<SwitchPreference
android:key="visiblepattern_profile"
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile" />
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
<com.android.settings.RestrictedListPreference
android:key="privacy_lock_screen_work_profile_notifications"

3
res/xml/security_advanced_settings.xml
View File

@@ -144,7 +144,8 @@
<SwitchPreference
android:key="visiblepattern_profile"
android:title="@string/lockpattern_settings_enable_visible_pattern_title_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"

3
src/com/android/settings/safetycenter/SafetyCenterUtils.java
View File

@@ -40,7 +40,6 @@ import com.android.settings.notification.LockScreenNotificationPreferenceControl
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;
@@ -69,8 +68,6 @@ public final class SafetyCenterUtils {
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(