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-v21/themes.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 'src/main/res/values-v21/themes.xml')
| -rw-r--r-- | src/main/res/values-v21/themes.xml | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml new file mode 100644 index 00000000..75539533 --- /dev/null +++ b/src/main/res/values-v21/themes.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primarydark</item> + <item name="android:colorAccent">@color/accent</item> + + <item name="TextSizeInfo">12sp</item> + <item name="TextSizeBody">14sp</item> + <item name="TextSizeHeadline">20sp</item> + + <item name="attr/icon_add_group">@drawable/ic_group_add_white_48dp</item> + <item name="attr/icon_add_person">@drawable/ic_person_add_white_48dp</item> + <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item> + <item name="attr/icon_chat">@drawable/ic_chat_white_48dp</item> + <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_36dp</item> + <item name="attr/icon_discard">@drawable/ic_delete_white_48dp</item> + <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item> + <item name="attr/icon_edit">@drawable/ic_edit_white_48dp</item> + <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_36dp</item> + <item name="attr/icon_group">@drawable/ic_group_white_48dp</item> + <item name="attr/icon_new">@drawable/ic_add_white_48dp</item> + <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_48dp</item> + <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_48dp</item> + <item name="attr/icon_refresh">@drawable/ic_refresh_white_48dp</item> + <item name="attr/icon_remove">@drawable/ic_remove_grey600_36dp</item> + <item name="attr/icon_search">@drawable/ic_search_white_48dp</item> + <item name="attr/icon_secure">@drawable/ic_lock_outline_white_48dp</item> + <item name="attr/icon_settings">@drawable/ic_settings_grey600_36dp</item> + <item name="attr/icon_import_export">@drawable/ic_import_export_white_48dp</item> + + </style> + +</resources>
\ No newline at end of file |