diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-05-20 03:39:58 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-05-20 03:39:58 +0200 |
| commit | 4f36aa39a4e8aa5128c12a713bd9d3d4d9b51469 (patch) | |
| tree | 1a87a4e98b88f4e0eb3fc36bcee74f403acf0abe /src/main/res/xml | |
| parent | fbf81f59dbc17951faea945cca979312201d00fe (diff) | |
| parent | 7824c01748a89688c5f76307cc1f4221a9e2ffb5 (diff) | |
Merge branch 'development'1.4.0
Diffstat (limited to 'src/main/res/xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 417e60a4..5b7d6904 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -105,6 +105,14 @@ android:key="send_button_status" android:summary="@string/pref_use_send_button_to_indicate_status_summary" android:title="@string/pref_use_send_button_to_indicate_status" /> + <ListPreference + android:key="quick_action" + android:defaultValue="recent" + android:entries="@array/quick_actions" + android:entryValues="@array/quick_action_values" + android:summary="@string/pref_quick_action_summary" + android:title="@string/pref_quick_action" + android:dialogTitle="@string/choose_quick_action"/> <CheckBoxPreference android:defaultValue="false" android:key="show_dynamic_tags" |