From: Andy Scherzinger Date: Fri, 11 Sep 2015 10:47:01 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~31 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/13a73dd56872b6fcbc12ab8c62806cbfd48dc93b?hp=7182b1d2b13ac7182ef9df2d6bb46657b8d2417b Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- diff --git a/res/drawable-hdpi/ic_checkbox_blank_outline.png b/res/drawable-hdpi/ic_checkbox_blank_outline.png new file mode 100644 index 00000000..198568de Binary files /dev/null and b/res/drawable-hdpi/ic_checkbox_blank_outline.png differ diff --git a/res/drawable-hdpi/ic_checkbox_marked.png b/res/drawable-hdpi/ic_checkbox_marked.png new file mode 100644 index 00000000..92d4109c Binary files /dev/null and b/res/drawable-hdpi/ic_checkbox_marked.png differ diff --git a/res/drawable-xhdpi/ic_checkbox_blank_outline.png b/res/drawable-xhdpi/ic_checkbox_blank_outline.png new file mode 100644 index 00000000..05024eb2 Binary files /dev/null and b/res/drawable-xhdpi/ic_checkbox_blank_outline.png differ diff --git a/res/drawable-xhdpi/ic_checkbox_marked.png b/res/drawable-xhdpi/ic_checkbox_marked.png new file mode 100644 index 00000000..3a2ca107 Binary files /dev/null and b/res/drawable-xhdpi/ic_checkbox_marked.png differ diff --git a/res/drawable-xxhdpi/ic_checkbox_blank_outline.png b/res/drawable-xxhdpi/ic_checkbox_blank_outline.png new file mode 100644 index 00000000..ffb1ea8c Binary files /dev/null and b/res/drawable-xxhdpi/ic_checkbox_blank_outline.png differ diff --git a/res/drawable-xxhdpi/ic_checkbox_marked.png b/res/drawable-xxhdpi/ic_checkbox_marked.png new file mode 100644 index 00000000..fba7e0c9 Binary files /dev/null and b/res/drawable-xxhdpi/ic_checkbox_marked.png differ diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml index bd4b0b6b..d90fb8a3 100644 --- a/res/layout-v14/generic_explanation.xml +++ b/res/layout-v14/generic_explanation.xml @@ -49,15 +49,17 @@ android:orientation="horizontal" > -