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

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

Browse Source 
am: d174ceb27b

Change-Id: I25f852eba45c4a2f3c0106f425e3f02a82600951
This commit is contained in:
Pavel Grafov
2018-03-21 15:26:37 +00:00
committed by android-build-merger
parent e61ce6008b d174ceb27b
commit 35b901c97f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/security_lockscreen_settings.xml
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"