Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 735f8ee8 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

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

parents 07e0e5c8 b758a84e

res/xml/more_security_privacy_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"

res/xml/security_advanced_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/safetycenter/SafetyCenterUtils.java

+0 −3
Original line number Diff line number Diff line
@@ -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(