Merge "Show setting for work profile lock screen notification" into oc-dev

This commit is contained in:
TreeHugger Robot
2017-05-25 22:41:06 +00:00
committed by Android (Google) Code Review
6 changed files with 117 additions and 33 deletions

View File

@@ -15,21 +15,32 @@
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/lockscreen_settings_title">
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/lockscreen_settings_title">
<com.android.settings.notification.RestrictedDropDownPreference
android:key="security_setting_lock_screen_notif"
android:title="@string/lock_screen_notifications_title"
android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="add_users_when_locked"
android:title="@string/user_add_on_lockscreen_menu" />
<com.android.settingslib.RestrictedPreference
android:key="owner_info_settings"
android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary" />
<PreferenceCategory
android:key="security_setting_lock_screen_notif_work_header"
android:title="@string/profile_section_header">
<com.android.settings.notification.RestrictedDropDownPreference
android:key="lock_screen_notifications"
android:key="security_setting_lock_screen_notif_work"
android:title="@string/lock_screen_notifications_title"
android:summary="@string/summary_placeholder"/>
android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="add_users_when_locked"
android:title="@string/user_add_on_lockscreen_menu"/>
<com.android.settingslib.RestrictedPreference
android:key="owner_info_settings"
android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary"/>
</PreferenceCategory>
</PreferenceScreen>