diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-09-12 22:32:47 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-09-13 17:29:36 +0200 |
| commit | 46b77bf34219aa47e916f0ab980d3bd5bb05ba34 (patch) | |
| tree | 0a73271b9cdea5577b7d69dbdbf525f24bcc31b7 /src/main/res | |
| parent | e50ba72e8ae024e64b1e2b2838f73faf64330adb (diff) | |
initial work toward api 26+
* introduce notification channels
* always use foreground service on 26+
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values/strings.xml | 11 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 14 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 1481bc6cc..3c1e766da 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -814,4 +814,15 @@ <string name="pref_quick_share_attachment_choice">Attachment choice</string> <string name="phone_book">Address book</string> <string name="unable_to_save_recording">Unable to save recording</string> + <string name="foreground_service_channel_name">Foreground service</string> + <string name="foreground_service_channel_description">This notification category is used to display a permanent notification indicating that Conversations is running.</string> + <string name="notification_group_status_information">Status Information</string> + <string name="error_channel_name">Connectivity Problems</string> + <string name="error_channel_description">This notification category is used to display a notification in case there is a problem connecting to an account.</string> + <string name="notification_group_messages">Messages</string> + <string name="messages_channel_name">Messages</string> + <string name="silent_messages_channel_name">Silent messages</string> + <string name="silent_messages_channel_description">This notification group is used to display notifications that should not trigger any sound. For example when being active on another device (Grace Period).</string> + <string name="pref_more_notification_settings">Notification Settings</string> + <string name="pref_more_notification_settings_summary">Importance, Sound, Vibrate</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index b4edb7a34..73d817782 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -152,6 +152,20 @@ android:key="notifications_from_strangers" android:summary="@string/pref_notifications_from_strangers_summary" android:title="@string/pref_notifications_from_strangers" /> + <PreferenceScreen + android:dependency="show_notification" + android:key="more_notification_settings" + android:summary="@string/pref_more_notification_settings_summary" + android:title="@string/pref_more_notification_settings"> + <intent android:action="android.settings.CHANNEL_NOTIFICATION_SETTINGS"> + <extra + android:name="android.provider.extra.APP_PACKAGE" + android:value="@string/applicationId" /> + <extra + android:name="android.provider.extra.CHANNEL_ID" + android:value="messages" /> + </intent> + </PreferenceScreen> </PreferenceScreen> <!--Attachments--> <PreferenceScreen |