diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-11-23 21:25:29 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-11-23 21:25:29 +0100 |
commit | 7ca03e9f1958f979a8791726d3b60d03a5606197 (patch) | |
tree | 8c5df4274247e2897e92de05f74bb8ed1df05906 /src/main/res | |
parent | 25056d10a6648aedd0d77fccf80a33adf65d0f8b (diff) |
bring back quick share (default off)
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/main/res/xml/preferences.xml | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5522fe6ed..25c5df7cf 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -739,4 +739,6 @@ <string name="contacts_have_read_up_to_this_point">%s have read up to this point</string> <string name="contact_has_read_up_to_this_point">%s has read up to this point</string> <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s +%2$d% more have read up to this point</string> + <string name="pref_return_to_previous">Quick Sharing</string> + <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index c1ccd31c4..0c7552323 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -149,6 +149,11 @@ android:key="video_compression" android:summary="@string/pref_video_compression_summary" android:title="@string/pref_video_compression" /> + <CheckBoxPreference + android:defaultValue="@bool/return_to_previous" + android:key="return_to_previous" + android:title="@string/pref_return_to_previous" + android:summary="@string/pref_return_to_previous_summary"/> </PreferenceScreen> <!--status--> <PreferenceScreen |