From: Andy Scherzinger Date: Mon, 17 Aug 2015 14:04:17 +0000 (+0200) Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... X-Git-Tag: beta-20151128~7^2~45 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b669bd77374750484eb4b67e38899b643210e35b?hp=16a5bdc8d18beb35a2400daa20a0588f669dfa32 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons --- diff --git a/res/layout/file_actions.xml b/res/layout/file_actions.xml new file mode 100644 index 00000000..abc42fb4 --- /dev/null +++ b/res/layout/file_actions.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/res/layout/simple_dialog_list_item.xml b/res/layout/simple_dialog_list_item.xml new file mode 100644 index 00000000..96020eb6 --- /dev/null +++ b/res/layout/simple_dialog_list_item.xml @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index c931a36d..f755a1c5 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -38,6 +38,7 @@ @color/owncloud_blue_accent + #1F1F1F @color/owncloud_blue diff --git a/res/values/styles.xml b/res/values/styles.xml index 4e35d089..765ee448 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -51,9 +51,7 @@ @color/primary - +