Commit 844d098e authored by Romain Hunault's avatar Romain Hunault

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents 35d72f8c ffb84a13
......@@ -94,9 +94,17 @@
android:summary="@string/app_notification_override_dnd_summary"
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
android:key="app_link"
android:order="17"
android:order="18"
android:title="@string/app_settings_link"
settings:allowDividerAbove="true"/>
</PreferenceCategory>
......
......@@ -50,6 +50,7 @@ public class AppNotificationSettings extends NotificationSettingsBase {
private static String KEY_ADVANCED_CATEGORY = "app_advanced";
private static String KEY_BADGE = "badge";
private static String KEY_APP_LINK = "app_link";
private static String KEY_SOUND_TIMEOUT = "sound_timeout";
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
Preference badge = findPreference(KEY_BADGE);
Preference appLink = findPreference(KEY_APP_LINK);
Preference soundTimeout = findPreference(KEY_SOUND_TIMEOUT);
removePreference(KEY_ADVANCED_CATEGORY);
if (badge != null) {
screen.addPreference(badge);
......@@ -74,6 +76,9 @@ public class AppNotificationSettings extends NotificationSettingsBase {
if (appLink != null) {
screen.addPreference(appLink);
}
if (soundTimeout != null) {
screen.addPreference(soundTimeout);
}
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment