Commit graph

28 commits

Author SHA1 Message Date
AndyScherzinger
fc6e3fc458
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
# Conflicts:
#	res/layout/drawer.xml
#	res/layout/drawer_header.xml
#	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
2016-11-02 00:18:24 +01:00
AndyScherzinger
50cbf61872
code review changes 2016-11-01 23:35:18 +01:00
AndyScherzinger
2e4fbe0268
fixed file headers 2016-11-01 23:35:17 +01:00
Andy Scherzinger
db67a4f633 header fix 2016-09-26 17:59:14 +02:00
Andy Scherzinger
457027a196 fixed the background color 2016-08-18 15:55:11 +02:00
Andy Scherzinger
0f80bdc894 CR changes 2016-08-18 15:55:11 +02:00
Andy Scherzinger
e790d4a520 initial layout changes for in drawer quota display 2016-08-18 15:55:11 +02:00
Andy Scherzinger
86dc83a96a ellipsized superlong username in the dropdown list 2016-06-25 16:27:14 +02:00
Andy Scherzinger
7f72e8cabd housekeeping removing old account switching code 2016-06-25 16:26:51 +02:00
Andy Scherzinger
ed33c0aff4 initial rewrite to make use of the toolbar 2016-06-25 16:26:44 +02:00
Andy Scherzinger
2d0fc03ef0 remove divider according to #1428 2016-03-01 15:37:32 +01:00
Andy Scherzinger
a812784ddd Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Conflicts (resolved):
	res/layout/drawer.xml
	res/values/colors.xml
	res/values/setup.xml
2015-12-28 20:03:25 +01:00
David A. Velasco
d5c4d7ab92 Changes from code review 2015-12-17 15:49:55 +01:00
David A. Velasco
147e6989c8 Added colors for header of navigation drawer and login button to the list of brandable colors 2015-12-14 12:50:52 +01:00
Andy Scherzinger
efdcb97963 setting divider color to #eee as decided by @jancborchardt 2015-11-02 12:05:52 +01:00
Andy Scherzinger
92af92ee3b merged part of the fixes from material buttons branch to fix bugs reported in PR #1076 2015-08-14 17:18:36 +02:00
Andy Scherzinger
7df40c01c8 fixed drawer font size, changed color according to material guide 2015-08-14 16:00:35 +02:00
Andy Scherzinger
9d08a3f306 fix for drawer width 2015-08-14 15:40:22 +02:00
Andy Scherzinger
8a8eb435a3 set standard 16dp whitespaces via config values not hardcoded 2015-08-13 18:08:21 +02:00
Andy Scherzinger
05ca0270a8 fixed button style blue/grey 2015-08-12 18:54:27 +02:00
Andy Scherzinger
5257af90bc fixed username to be single line and ellipsized in case of lang names 2015-08-12 18:48:33 +02:00
Andy Scherzinger
5ded9e818b aligned account name with menu items 2015-08-05 14:07:00 +02:00
Andy Scherzinger
b5f8c0b087 changed alignment of drawer's content according to jan's suggestions 2015-08-04 19:02:36 +02:00
AndyScherzinger
bfea14e876 setting the username on the drawer header for startup and coming back from the preferences screen for account switching 2015-07-27 20:20:46 +02:00
AndyScherzinger
d474239b21 initial material design changes for the action bar 2015-07-26 01:49:27 +02:00
masensio
cf535b70f1 Disable 'Accounts' in Navigation Drawer 2015-05-29 11:32:36 +02:00
masensio
6e2dd6b191 Enable fitsSystemWindows in drawer.xml 2015-05-28 13:18:56 +02:00
masensio
db01425a07 Add NavigationDrawer to image preview 2015-05-28 11:07:14 +02:00