tobiasKaminsky 8dbb5b6305 wip ... Conflicts: res/layout/drawer.xml src/com/owncloud/android/ui/activity/FileActivity.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java		2016-06-25 16:27:08 +02:00
..
attrs.xml	changed according to latest discussion	2015-12-01 22:00:53 +01:00
bools.xml	Add documents provider	2016-06-20 22:15:02 +02:00
colors.xml	corresponding primary dark color	2016-06-08 16:17:43 +02:00
dims.xml	wip	2016-06-25 16:27:08 +02:00
oauth2_configuration.xml	Update UI for login view according setup config	2016-04-29 12:35:53 +02:00
setup.xml	Update welcome url, fixes #16	2016-06-22 19:14:19 +02:00
strings.xml	initial (functionless) account switcher for the drawer header and display size depending header sizing	2016-06-25 16:26:46 +02:00
styles.xml	general menu/account list switch implemented (open: populate account list)	2016-06-25 16:26:47 +02:00
versioned_styles.xml	fixed button style blue/grey	2015-08-12 18:54:27 +02:00