Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 6 Nov 2015 10:54:28 +0000 (11:54 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 6 Nov 2015 10:54:28 +0000 (11:54 +0100)
commit080a8ab7af2bc48e3c5fa1334ae91d21073e26c2
tree595844d417110bd06e5aed151825e19ca58d4b4c
parent0e9ddf44e12cf70d4556c8cc1c3e9abbed8a5d55
parentdfcbaf95210191e820f24b6beb02db3e22cd0793
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
build.gradle
res/layout/list_fragment.xml
res/values/colors.xml
res/values/styles.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java