diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:51:27 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:51:27 +0100 |
| commit | 07b07115d684b27ebc0c3ee4f70ef2e33a3b2dbb (patch) | |
| tree | 3b19be17a403cfbb2a695e50da9a1b277376ac45 /src/main/res | |
| parent | 5b9c690c47cbb6fd352d7ddce3b13e6bf119fc22 (diff) | |
| parent | bdc86bb8e3667acb4d3f59ece718dc763d59374f (diff) | |
Merge branch 'feature/foreground_service' into development
Conflicts:
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/drawable-hdpi/ic_stat_communication_import_export.png | bin | 0 -> 620 bytes | |||
| -rw-r--r-- | src/main/res/drawable-mdpi/ic_stat_communication_import_export.png | bin | 0 -> 392 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xhdpi/ic_stat_communication_import_export.png | bin | 0 -> 972 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_stat_communication_import_export.png | bin | 0 -> 1860 bytes | |||
| -rw-r--r-- | src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 5 |
6 files changed, 9 insertions, 0 deletions
diff --git a/src/main/res/drawable-hdpi/ic_stat_communication_import_export.png b/src/main/res/drawable-hdpi/ic_stat_communication_import_export.png Binary files differnew file mode 100644 index 00000000..f929996e --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_stat_communication_import_export.png diff --git a/src/main/res/drawable-mdpi/ic_stat_communication_import_export.png b/src/main/res/drawable-mdpi/ic_stat_communication_import_export.png Binary files differnew file mode 100644 index 00000000..b581e174 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_stat_communication_import_export.png diff --git a/src/main/res/drawable-xhdpi/ic_stat_communication_import_export.png b/src/main/res/drawable-xhdpi/ic_stat_communication_import_export.png Binary files differnew file mode 100644 index 00000000..a1d62d41 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_stat_communication_import_export.png diff --git a/src/main/res/drawable-xxhdpi/ic_stat_communication_import_export.png b/src/main/res/drawable-xxhdpi/ic_stat_communication_import_export.png Binary files differnew file mode 100644 index 00000000..3539cd91 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_stat_communication_import_export.png diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 645dc8e5..0fd706f3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -328,4 +328,8 @@ <string name="verified">Verified!</string> <string name="smp_requested">Contact requested SMP verification</string> <string name="no_otr_session_found">No valid OTR session has been found!</string> + <string name="conversations_foreground_service">Conversations</string> + <string name="touch_to_disable">Touch to disable foreground service</string> + <string name="pref_keep_foreground_service">Keep service in foreground</string> + <string name="pref_keep_foreground_service_summary">Prevents the operating system from killing your connection</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 15a61e87..3be65b7a 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -101,6 +101,11 @@ android:key="indicate_received" android:summary="@string/pref_use_indicate_received_summary" android:title="@string/pref_use_indicate_received" /> + <CheckBoxPreference + android:defaultValue="false" + android:key="keep_foreground_service" + android:title="@string/pref_keep_foreground_service" + android:summary="@string/pref_keep_foreground_service_summary" /> </PreferenceCategory> </PreferenceScreen> |
