diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/values/attrs.xml | |
parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to '')
-rw-r--r-- | src/main/res/values/attrs.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 2354a5e8..e314f752 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -5,4 +5,24 @@ <attr name="TextSizeBody" format="dimension" /> <attr name="TextSizeHeadline" format="dimension" /> + <attr name="icon_add_group" format="reference"/> + <attr name="icon_add_person" format="reference"/> + <attr name="icon_cancel" format="reference"/> + <attr name="icon_chat" format="reference"/> + <attr name="icon_copy" format="reference"/> + <attr name="icon_discard" format="reference"/> + <attr name="icon_download" format="reference"/> + <attr name="icon_edit" format="reference"/> + <attr name="icon_edit_dark" format="reference"/> + <attr name="icon_group" format="reference"/> + <attr name="icon_new" format="reference"/> + <attr name="icon_new_attachment" format="reference"/> + <attr name="icon_not_secure" format="reference"/> + <attr name="icon_refresh" format="reference"/> + <attr name="icon_remove" format="reference"/> + <attr name="icon_search" format="reference"/> + <attr name="icon_secure" format="reference"/> + <attr name="icon_settings" format="reference"/> + <attr name="icon_import_export" format="reference"/> + </resources>
\ No newline at end of file |