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

Merge "Fix duplicated order in notification settings layout" into udc-dev

Browse Source
This commit is contained in:
Angela Wang
2023-03-03 08:56:49 +00:00
committed by Android (Google) Code Review
parent 8efe31900c 2b4830720c
commit 5da8894d9a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/xml/configure_notification_settings.xml
View File

@@ -131,14 +131,14 @@
<Preference <Preference
android:fragment="com.android.settings.accessibility.FlashNotificationsPreferenceFragment" android:fragment="com.android.settings.accessibility.FlashNotificationsPreferenceFragment"
android:key="flash_notifications_preference" android:key="flash_notifications_preference"
android:order="18" android:order="19"
android:persistent="false" android:persistent="false"
android:title="@string/flash_notifications_title" android:title="@string/flash_notifications_title"
settings:controller="com.android.settings.accessibility.FlashNotificationsPreferenceController" /> settings:controller="com.android.settings.accessibility.FlashNotificationsPreferenceController" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="app_and_notif_cell_broadcast_settings" android:key="app_and_notif_cell_broadcast_settings"
android:order="19" android:order="20"
android:title="@string/cell_broadcast_settings" android:title="@string/cell_broadcast_settings"
settings:useAdminDisabledSummary="true"> settings:useAdminDisabledSummary="true">
<intent <intent
@@ -149,33 +149,33 @@
<SwitchPreference <SwitchPreference
android:key="silent_icons" android:key="silent_icons"
android:order="20" android:order="21"
android:title="@string/silent_notifications_status_bar" android:title="@string/silent_notifications_status_bar"
settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/> settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
<SwitchPreference <SwitchPreference
android:key="show_snooze_options" android:key="show_snooze_options"
android:order="21" android:order="22"
android:title="@string/snooze_options_title" android:title="@string/snooze_options_title"
settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" /> settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
<!-- Notification badging --> <!-- Notification badging -->
<SwitchPreference <SwitchPreference
android:key="notification_badging" android:key="notification_badging"
android:order="22" android:order="23"
android:title="@string/notification_badging_title" android:title="@string/notification_badging_title"
settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/> settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
<!-- Pulse notification light, on devices that support it --> <!-- Pulse notification light, on devices that support it -->
<SwitchPreference <SwitchPreference
android:key="notification_pulse" android:key="notification_pulse"
android:order="23" android:order="24"
android:title="@string/notification_pulse_title" android:title="@string/notification_pulse_title"
settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/> settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
<com.android.settingslib.PrimarySwitchPreference <com.android.settingslib.PrimarySwitchPreference
android:key="notification_assistant" android:key="notification_assistant"
android:order="24" android:order="25"
android:title="@string/notification_assistant_title" android:title="@string/notification_assistant_title"
android:summary="@string/notification_assistant_summary" android:summary="@string/notification_assistant_summary"
settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/> settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>