Merge "Move work notification settings back to bottom" into oc-mr1-dev
am: 466adba25e
Change-Id: Ib6e3348917eb90515aeef8e7131e55c95ee0768e
This commit is contained in:
@@ -22,17 +22,12 @@
|
||||
android:key="dashboard_tile_placeholder"
|
||||
android:order="1"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="lock_screen_notifications_profile_header"
|
||||
android:title="@string/profile_section_header">
|
||||
|
||||
<!-- When device is locked -->
|
||||
<com.android.settings.notification.RestrictedDropDownPreference
|
||||
android:key="lock_screen_notifications_profile"
|
||||
android:key="lock_screen_notifications"
|
||||
android:title="@string/lock_screen_notifications_title"
|
||||
android:summary="@string/summary_placeholder"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<!-- Notification badging -->
|
||||
<SwitchPreference
|
||||
android:key="notification_badging"
|
||||
@@ -43,12 +38,6 @@
|
||||
android:key="notification_pulse"
|
||||
android:title="@string/notification_pulse_title"/>
|
||||
|
||||
<!-- When device is locked -->
|
||||
<com.android.settings.notification.RestrictedDropDownPreference
|
||||
android:key="lock_screen_notifications"
|
||||
android:title="@string/lock_screen_notifications_title"
|
||||
android:summary="@string/summary_placeholder"/>
|
||||
|
||||
<!-- Default notification ringtone -->
|
||||
<com.android.settings.DefaultRingtonePreference
|
||||
android:key="notification_default_ringtone"
|
||||
@@ -62,4 +51,14 @@
|
||||
android:title="@string/fingerprint_swipe_for_notifications_title"
|
||||
android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="lock_screen_notifications_profile_header"
|
||||
android:title="@string/profile_section_header">
|
||||
|
||||
<com.android.settings.notification.RestrictedDropDownPreference
|
||||
android:key="lock_screen_notifications_profile"
|
||||
android:title="@string/lock_screen_notifications_title"
|
||||
android:summary="@string/summary_placeholder"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
|
Reference in New Issue
Block a user