Commit graph

84 commits

Author SHA1 Message Date
David A. Velasco
259c94a45b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-15 09:48:12 +01:00
Andy Scherzinger
e8c64ebf8d initial implementaion for click events + using the import icon for upload from other apps, also fixed the checkboxes for hdpi/mdpi 2016-02-25 18:07:28 +01:00
David A. Velasco
d2940f6214 Used OC trashbin icon in uploads view 2016-02-24 10:11:54 +01:00
David A. Velasco
286dc8fafd Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-22 10:21:46 +01:00
Andy Scherzinger
3fa2d292bb fixed ic_refresh icon work with 24dp origial grey600 version 2016-02-15 17:34:45 +01:00
David A. Velasco
82b0b7a84f Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-15 14:59:04 +01:00
Andy Scherzinger
bc4de91e93 material style play icon added 2016-02-12 12:50:00 +01:00
masensio
f11646bc6e Review ic_refresh dimensions 2016-01-21 09:29:58 +01:00
masensio
814a70f6a3 Update refresh icon in uploads view 2016-01-20 18:41:52 +01:00
David A. Velasco
e7901656a1 Polish UI to edit permissions 2016-01-11 15:34:41 +01:00
masensio
2181239c6d Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-01-08 11:21:23 +01:00
tobiasKaminsky
d7e9ef92b8 fixed according to review 2016-01-05 11:50:00 +01:00
masensio
540d123ad5 Merge branch 'master' into reliable_uploads_actions_uploads_view 2015-12-29 12:46:45 +01:00
masensio
a2b680edd0 Merge branch 'reliable_uploads' into reliable_uploads_actions_uploads_view 2015-12-10 17:35:32 +01:00
Andy Scherzinger
c31f602fd1 Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Conflicts:
	res/layout/list_item.xml
2015-11-06 11:38:51 +01:00
David A. Velasco
0db4fc9b17 Sync user and group shares into database 2015-10-30 16:25:52 +01:00
Andy Scherzinger
9e15d2459d Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons 2015-09-15 18:44:49 +02:00
David A. Velasco
0290523c03 Added icons for file type TEXT 2015-09-15 18:07:59 +02:00
Andy Scherzinger
6eccdc25b3 Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons
Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
2015-09-11 13:06:14 +02:00
Marc Plano-Lesay
b4875c69cc Add additional filetype icons 2015-09-09 23:30:09 +02:00
Andy Scherzinger
0234ca22ea Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-09 11:42:11 +02:00
Marc Plano-Lesay
502ff0a216 Use new filetype icons 2015-08-31 19:17:05 +02:00
Andy Scherzinger
18811141fb added delete icon files 2015-08-21 17:09:18 +02:00
Andy Scherzinger
7f13b98cc0 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
2015-08-18 23:20:01 +02:00
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +02:00
Andy Scherzinger
f4445284d0 material checkbox drawables instead of version dependend ones 2015-08-07 18:05:34 +02:00
Andy Scherzinger
a257935b8c Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency 2015-08-06 17:13: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
77457f276f adding material icons to resolutions < xxhdpi 2015-07-26 19:40:31 +02:00
masensio
378b28f346 Update some file icons 2015-06-23 14:50:02 +02:00
David A. Velasco
36128298d4 Updated file icons with higher resolutions 2015-06-23 14:40:49 +02:00
tobiasKaminsky
6d4207a06b Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
masensio
42b5a1e28f Update some icons 2015-01-30 14:37:16 +01:00
masensio
700318fec0 Update some icons 2015-01-30 11:00:14 +01:00
tobiasKaminsky
0ae80926ac update 2015-01-05 19:53:40 +01:00
tobiasKaminsky
bdd46fd811 cleanup 2014-11-19 09:11:44 +01:00
tobiasKaminsky
f331120a14 Merge remote-tracking branch 'upstream/develop' into imageGrid
Conflicts:
	owncloud-android-library
	res/layout/list_item.xml
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
2014-11-05 22:07:11 +01:00
tobiasKaminsky
c1f920cc75 - update folder_public name 2014-10-20 19:46:10 +02:00
tobiasKaminsky
8ae90ee5e5 - new icons 2014-10-04 11:56:43 +02:00
jabarros
687331ec28 Change folder and rigth shared by link icons 2014-08-01 10:38:37 +02:00
jabarros
df5fe2d648 Change the star and downloaded/downloading/uploading icons in list_item layout desing 2014-07-09 09:09:37 +02:00
David A. Velasco
4c4a0cb023 Merge pull request #555 from owncloud/update_shared_folder_icon
Updated icon for folder publicly shared.
2014-07-08 12:57:19 +02:00
jabarros
df8e9fa2c3 Merge pull request #541 from owncloud/fix_issue_540
Fix issue 540
2014-07-07 13:02:42 +02:00
jabarros
0b8cf52626 Add folder public icon 2014-07-07 10:48:13 +02:00
jabarros
fc579b9221 Replace old sharelink icon for new one. Add 'shared with me' new icons 2014-07-01 09:59:29 +02:00
masensio
1863b75785 Update ic_action_create_dir and ic_action_upload in drawable folders, to show them on actionBar (dark grey --> light gray) 2014-06-13 13:50:18 +02:00
masensio
476bfba9e4 Update file images, add new mimetypes to show: spreadsheets, impress, rar, rtf and 3gp 2014-05-27 13:16:16 +02:00
masensio
7a9149a66a Merge pull request #392 from pmarasse/pullup
Modified actionbar to allow display of icon+text on tablets
2014-04-03 11:02:54 +02:00
David A. Velasco
41f86353da Updated notification icon for Android 2.x 2014-03-24 13:17:46 +01:00
masensio
b63fb51226 Update notification icons 2014-03-24 10:46:48 +01:00