Merge "Move work profile notification settings to the bottom." into pi-dev

This commit is contained in:
TreeHugger Robot
2018-03-21 15:01:33 +00:00
committed by Android (Google) Code Review

View File

@@ -40,9 +40,12 @@
android:summary="@string/lockdown_settings_summary" android:summary="@string/lockdown_settings_summary"
settings:controller="com.android.settings.security.LockdownButtonPreferenceController"/> settings:controller="com.android.settings.security.LockdownButtonPreferenceController"/>
<!-- Work profile settings are at the bottom with high order value to avoid users thinking that
any of the above settings (including dynamic) are specific to the work profile. -->
<PreferenceCategory <PreferenceCategory
android:key="security_setting_lock_screen_notif_work_header" android:key="security_setting_lock_screen_notif_work_header"
android:title="@string/profile_section_header"> android:title="@string/profile_section_header"
android:order="1000">
<com.android.settings.RestrictedListPreference <com.android.settings.RestrictedListPreference
android:key="security_setting_lock_screen_notif_work" android:key="security_setting_lock_screen_notif_work"