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

Merge "Move work notification settings back to bottom" into oc-mr1-dev

Browse Source 
am: 466adba25e

Change-Id: Ib6e3348917eb90515aeef8e7131e55c95ee0768e
This commit is contained in:
Winston Man
2017-08-09 09:19:43 +00:00
committed by android-build-merger
parent 06917056fd 466adba25e
commit a266a2a0c0
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
res/xml/configure_notification_settings.xml
View File

@@ -22,17 +22,12 @@
android:key="dashboard_tile_placeholder" android:key="dashboard_tile_placeholder"
android:order="1"/> android:order="1"/>
<PreferenceCategory <!-- When device is locked -->
android:key="lock_screen_notifications_profile_header"
android:title="@string/profile_section_header">
<com.android.settings.notification.RestrictedDropDownPreference <com.android.settings.notification.RestrictedDropDownPreference
android:key="lock_screen_notifications_profile" android:key="lock_screen_notifications"
android:title="@string/lock_screen_notifications_title" android:title="@string/lock_screen_notifications_title"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"/>
</PreferenceCategory>
<!-- Notification badging --> <!-- Notification badging -->
<SwitchPreference <SwitchPreference
android:key="notification_badging" android:key="notification_badging"
@@ -43,12 +38,6 @@
android:key="notification_pulse" android:key="notification_pulse"
android:title="@string/notification_pulse_title"/> 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 --> <!-- Default notification ringtone -->
<com.android.settings.DefaultRingtonePreference <com.android.settings.DefaultRingtonePreference
android:key="notification_default_ringtone" android:key="notification_default_ringtone"
@@ -62,4 +51,14 @@
android:title="@string/fingerprint_swipe_for_notifications_title" android:title="@string/fingerprint_swipe_for_notifications_title"
android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" /> 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> </PreferenceScreen>