diff options
| author | Christian S <christian@pix-art.de> | 2016-04-14 20:44:59 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-14 20:44:59 +0200 |
| commit | 00f9ca537cd3f8095b664427b52a8989008a2dfe (patch) | |
| tree | 83d99c75e62dff4ac08aea1f67b7f0f196800d23 /src/main/res/values | |
| parent | 955e56561dd7293d985d84270056ebd8adfe2a91 (diff) | |
| parent | 39e717ed94de2800df587395ba77310660c2ea5c (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index d471e54ac..901ea7547 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -24,6 +24,7 @@ <attr name="icon_search" format="reference"/> <attr name="icon_secure" format="reference"/> <attr name="icon_settings" format="reference"/> + <attr name="icon_share" format="reference"/> <attr name="icon_import_export" format="reference"/> </resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a11283bd3..b12f8b59d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -640,4 +640,6 @@ <string name="pref_plugin_voice_recorder">Voice Recorder</string> <string name="pref_plugin_voice_recorder_summary">Send and receive voice messages</string> <string name="security_error_invalid_file_access">Security error: Invalid file access</string> + <string name="no_application_to_share_uri">No application found to share URI</string> + <string name="share_uri_with">Share URI with…</string> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 97342311b..b96c9b15e 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -31,6 +31,7 @@ <item name="attr/icon_secure">@drawable/ic_action_secure</item> <item name="attr/icon_settings">@drawable/ic_action_settings</item> <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item> + <item name="attr/icon_share">@drawable/ic_action_share</item> </style> <style name="ConversationsTheme.LargerText" parent="ConversationsTheme"> |