Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aafaacfa authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Reorder the new notification settings page 

Test: manual
Fixes: 176317477
Change-Id: I7dd784c446d4443be72de96c5a7cea7929388c71
parent 6c707076

res/values/strings.xml

+6 −3
Original line number Diff line number Diff line
@@ -8308,6 +8308,9 @@ 
    <!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->

    <string name="configure_notification_settings">Notifications</string>









    <!-- notification header - settings for conversation type notifications -->









    <string name="conversation_notifs_category">Conversation</string>

















    <!-- notification header - apps that have recently sent notifications -->









    <string name="recent_notifications">Recently sent</string>
















@@ -8315,7 +8318,7 @@







    <string name="recent_notifications_see_all_title">See all from last 7 days</string>

















    <!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] -->









    <string name="advanced_section_header">Advanced</string>









    <string name="advanced_section_header">General</string>

















    <!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] -->









    <string name="profile_section_header">Work notifications</string>








@@ -8482,8 +8485,8 @@







    <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->









    <string name="notification_pulse_title">Blink light</string>

















    <!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=60] -->









    <string name="lock_screen_notifications_title">Notifications on lock screen</string>









    <!-- Configure Notifications: Title for the option controlling privacy options for notifications. [CHAR LIMIT=60] -->









    <string name="lock_screen_notifications_title">Privacy</string>

















    <!-- Configure lock screen: Title for the option of unlocking directly to home. [CHAR LIMIT=30] -->









    <string name="lockscreen_bypass_title">Skip lock screen</string>

























res/xml/configure_notification_settings_v2.xml



+50
−84






























Original line number
Diff line number
Diff line







@@ -18,59 +18,27 @@







                  xmlns:settings="http://schemas.android.com/apk/res-auto"









                  android:title="@string/configure_notification_settings">



















    <com.android.settings.widget.VideoPreference









        android:key="notification_model_illustration"









        android:title="@string/summary_placeholder"









        settings:animation="@raw/notification_interruption_model"









        settings:controller="com.android.settings.widget.VideoPreferenceController"









        android:persistent="false" />



















    <Preference









        android:key="notification_history"









        android:title="@string/notification_history"









        android:summary="@string/notification_history_summary"









        settings:allowDividerAbove="true"









        settings:allowDividerBelow="false"









        android:order="2">









        <intent









            android:action="android.intent.action.MAIN"









            android:targetPackage="com.android.settings"









            android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />









    </Preference>



















    <PreferenceCategory









        android:key="conversation_category"









        android:title="@string/conversation_notifs_category">









        <Preference









            android:key="conversations"









            android:title="@string/conversations_category_title"









        android:order="3"









            settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"









            android:fragment="com.android.settings.notification.app.ConversationListSettings"









        />



















        <Preference









            android:key="notification_bubbles"









            android:title="@string/notification_bubbles_title"









            android:summary="@string/notifications_bubble_setting_on_summary"









        android:order="4"









            settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"









            android:fragment="com.android.settings.notification.BubbleNotificationSettings"









        />



















    <com.android.settingslib.RestrictedPreference









        android:key="app_and_notif_cell_broadcast_settings"









        android:title="@string/cell_broadcast_settings"









        android:order="5"









        settings:useAdminDisabledSummary="true">









        <intent









            android:action="android.intent.action.MAIN"









            android:targetPackage="@string/cell_broadcast_receiver_package"









            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>









    </com.android.settingslib.RestrictedPreference>









    </PreferenceCategory>



















    <PreferenceCategory









        android:key="recent_notifications_category"









        android:title="@string/recent_notifications"









        settings:allowDividerAbove="true"









        android:order="6">









        android:title="@string/recent_notifications">









        <!-- Placeholder for a list of recent apps -->



















        <!-- See all apps button -->








@@ -78,7 +46,6 @@







            android:key="all_notifications"









            android:title="@string/notifications_title"









            android:fragment="com.android.settings.applications.manageapplications.ManageApplications"









            android:order="7"









            settings:searchable="false">









            <extra









                android:name="classname"








@@ -86,11 +53,18 @@







        </Preference>









    </PreferenceCategory>





























    <PreferenceCategory









        android:key="configure_notifications_lock"









        android:title="@string/lock_screen_notifications_title"









        android:order="10">









        android:title="@string/lock_screen_notifications_title">









        <Preference









            android:key="notification_history"









            android:title="@string/notification_history"









            android:summary="@string/notification_history_summary">









            <intent









                android:action="android.intent.action.MAIN"









                android:targetPackage="com.android.settings"









                android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />









        </Preference>









        <!-- When device is locked -->









        <com.android.settings.RestrictedListPreference









            android:key="lock_screen_notifications"








@@ -120,9 +94,24 @@







    </PreferenceCategory>



















    <PreferenceCategory









        android:key="configure_notifications_advanced"









        android:order="15"









        settings:initialExpandedChildrenCount="0">









        android:key="advanced_section_header"









        android:title="@string/advanced_section_header">









        <com.android.settingslib.RestrictedPreference









            android:key="zen_mode_notifications"









            android:title="@string/zen_mode_settings_title"









            settings:useAdminDisabledSummary="true"









            android:fragment="com.android.settings.notification.zen.ZenModeSettings"









            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"









        />









        <com.android.settingslib.RestrictedPreference









            android:key="app_and_notif_cell_broadcast_settings"









            android:title="@string/cell_broadcast_settings"









            settings:useAdminDisabledSummary="true">









            <intent









                android:action="android.intent.action.MAIN"









                android:targetPackage="@string/cell_broadcast_receiver_package"









                android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>









        </com.android.settingslib.RestrictedPreference>



















        <SwitchPreference









             android:key="silent_icons"








@@ -140,33 +129,10 @@







            android:title="@string/notification_badging_title"









            settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>



















        <!-- Pulse notification light -->









        <!-- Pulse notification light, on devices that support it -->









        <SwitchPreference









            android:key="notification_pulse"









            android:title="@string/notification_pulse_title"









            settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>



















        <!-- Default notification ringtone -->









        <com.android.settings.DefaultRingtonePreference









            android:key="notification_default_ringtone"









            android:title="@string/notification_ringtone_title"









            android:dialogTitle="@string/notification_ringtone_title"









            android:summary="@string/summary_placeholder"









            android:ringtoneType="notification"









            settings:searchable="false"/>



















        <Preference









            android:key="gesture_swipe_down_fingerprint_notifications"









            android:title="@string/fingerprint_swipe_for_notifications_title"









            android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"









            settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/>



















        <com.android.settingslib.RestrictedPreference









            android:key="zen_mode_notifications"









            android:title="@string/zen_mode_settings_title"









            settings:useAdminDisabledSummary="true"









            android:fragment="com.android.settings.notification.zen.ZenModeSettings"









            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"









            settings:allowDividerAbove="false"/>









    </PreferenceCategory>









</PreferenceScreen>