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

Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I2a5163c23c36b1a6804e3953f505d6f86c0fb5ac
This commit is contained in:
Marie Matheson
2021-07-07 11:39:18 +00:00
committed by Automerger Merge Worker
parent 973b5cf127 67c5c5a58e
commit 7ec590a5a1
1 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
res/xml/security_dashboard_settings.xml
View File

@@ -62,47 +62,6 @@
settings:keywords="@string/keywords_biometric_settings" /> settings:keywords="@string/keywords_biometric_settings" />
</PreferenceCategory> </PreferenceCategory>
<!-- work profile security section -->
<PreferenceCategory
android:order="20"
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" />
<Preference
android:key="fingerprint_settings_profile"
android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder" />
<Preference
android:key="face_settings_profile"
android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder" />
<Preference
android:key="biometric_settings_profile"
android:title="@string/security_settings_biometric_preference_title"
android:summary="@string/summary_placeholder" />
</PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:order="40" android:order="40"
android:key="security_settings_device_admin_category" android:key="security_settings_device_admin_category"
@@ -170,4 +129,45 @@
android:summary="@string/confirm_sim_deletion_description" android:summary="@string/confirm_sim_deletion_description"
settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController"/> 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" />
<Preference
android:key="fingerprint_settings_profile"
android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder" />
<Preference
android:key="face_settings_profile"
android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder" />
<Preference
android:key="biometric_settings_profile"
android:title="@string/security_settings_biometric_preference_title"
android:summary="@string/summary_placeholder" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>