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

Commit ffb84a13 authored by LuK1337's avatar LuK1337 Committed by Luca Stefani
Browse files

Settings: Preserve sound timeout pref when showing legacy notification settings 

* Fixes : https://gitlab.com/LineageOS/issues/android/issues/936
          https://gitlab.com/LineageOS/issues/android/issues/939

Change-Id: I61da5790fd09f6340c6fdbe89378114cd1e0dc5b
parent 4616aaba

res/xml/channel_notification_settings.xml

+9 −1
Original line number Original line Diff line number Diff line
@@ -94,9 +94,17 @@ 
            android:summary="@string/app_notification_override_dnd_summary"

            android:summary="@string/app_notification_override_dnd_summary"

            settings:useAdditionalSummary="true"/>

            settings:useAdditionalSummary="true"/>





        <com.android.settings.RestrictedListPreference

            android:key="sound_timeout"

            android:order="17"

            android:title="@string/app_notification_sound_timeout_title"

            android:entries="@array/app_notification_sound_timeout_entries"

            android:entryValues="@array/app_notification_sound_timeout_values"

            android:persistent="false" />



        <Preference

        <Preference

            android:key="app_link"

            android:key="app_link"

            android:order="17"

            android:order="18"

            android:title="@string/app_settings_link"

            android:title="@string/app_settings_link"

            settings:allowDividerAbove="true"/>

            settings:allowDividerAbove="true"/>

    </PreferenceCategory>

    </PreferenceCategory>

src/com/android/settings/notification/AppNotificationSettings.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
    private static String KEY_ADVANCED_CATEGORY = "app_advanced";

    private static String KEY_ADVANCED_CATEGORY = "app_advanced";

    private static String KEY_BADGE = "badge";

    private static String KEY_BADGE = "badge";

    private static String KEY_APP_LINK = "app_link";

    private static String KEY_APP_LINK = "app_link";

    private static String KEY_SOUND_TIMEOUT = "sound_timeout";





    private List<NotificationChannelGroup> mChannelGroupList;

    private List<NotificationChannelGroup> mChannelGroupList;
@@ -66,6 +67,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
            // if showing legacy settings, pull advanced settings out of the advanced category

            // if showing legacy settings, pull advanced settings out of the advanced category

            Preference badge = findPreference(KEY_BADGE);

            Preference badge = findPreference(KEY_BADGE);

            Preference appLink = findPreference(KEY_APP_LINK);

            Preference appLink = findPreference(KEY_APP_LINK);

            Preference soundTimeout = findPreference(KEY_SOUND_TIMEOUT);

            removePreference(KEY_ADVANCED_CATEGORY);

            removePreference(KEY_ADVANCED_CATEGORY);

            if (badge != null) {

            if (badge != null) {

                screen.addPreference(badge);

                screen.addPreference(badge);
@@ -74,6 +76,9 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
            if (appLink != null) {

            if (appLink != null) {

                screen.addPreference(appLink);

                screen.addPreference(appLink);

            }

            }

            if (soundTimeout != null) {

                screen.addPreference(soundTimeout);

            }

        }

        }

    }

    }