Andy Scherzinger ab136a14a3 Merge branch 'multiSelect' of https://github.com/owncloud/android into multiSelectNew ... Conflicts: build.gradle oc_jb_workaround/build.gradle owncloud-android-library res/layout/uploader_layout.xml res/layout/uploader_list_item_layout.xml res/menu/file_actions_menu.xml res/values/setup.xml src/com/owncloud/android/authentication/AuthenticatorActivity.java src/com/owncloud/android/db/PreferenceManager.java src/com/owncloud/android/files/FileMenuFilter.java src/com/owncloud/android/files/FileOperationsHelper.java src/com/owncloud/android/ui/activity/FolderPickerActivity.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java		2016-06-30 15:11:34 +02:00
..
common_error.png	reverted back to light colored login	2015-08-18 17:48:10 +02:00
file.png	Use new filetype icons	2015-08-31 19:17:05 +02:00
file_application.png	Add additional filetype icons	2015-09-09 23:30:09 +02:00
file_calendar.png	Add additional filetype icons	2015-09-09 23:30:09 +02:00
file_code.png	Add additional filetype icons	2015-09-09 23:30:09 +02:00
file_doc.png	Use new filetype icons	2015-08-31 19:17:05 +02:00
file_image.png	Use new filetype icons	2015-08-31 19:17:05 +02:00
file_movie.png	Use new filetype icons	2015-08-31 19:17:05 +02:00
file_pdf.png	Use new filetype icons	2015-08-31 19:17:05 +02:00
file_ppt.png	Use new filetype icons	2015-08-31 19:17:05 +02:00
file_sound.png	Use new filetype icons	2015-08-31 19:17:05 +02:00
file_text.png	Added icons for file type TEXT	2015-09-15 18:07:59 +02:00
file_vcard.png	Add additional filetype icons	2015-09-09 23:30:09 +02:00
file_xls.png	Use new filetype icons	2015-08-31 19:17:05 +02:00
file_zip.png	adjusting the icon work to nextcloud + high resolution images	2016-06-09 17:52:37 +02:00
folder_external.png	adjusting the icon work to nextcloud + high resolution images	2016-06-09 17:52:37 +02:00
folder_public.png	adjusting the icon work to nextcloud + high resolution images	2016-06-09 17:52:37 +02:00
ic_account_circle.png	changed alignment of drawer's content according to jan's suggestions	2015-08-04 19:02:36 +02:00
ic_action_create_dir.png	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
ic_action_delete.png	Polish UI to edit permissions	2016-01-11 15:34:41 +01:00
ic_action_download.png	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
ic_action_refresh.png	fine tuning icon work on login screen, making landscape visually en par with portrait mode	2015-07-26 18:36:00 +02:00
ic_action_refresh_grey.png	fine tuning icon work on login screen, making landscape visually en par with portrait mode	2015-07-26 18:36:00 +02:00
ic_action_upload.png	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
ic_available_offline.png	Added white border to available offline icon	2016-06-01 17:07:13 +02:00
ic_cancel.png	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
ic_checkbox_blank_outline.png	material checkbox drawables instead of version dependend ones	2015-08-07 18:05:34 +02:00
ic_checkbox_marked.png	adjusting the icon work to nextcloud + high resolution images	2016-06-09 17:52:37 +02:00
ic_close.png	magnify/close icon work	2016-03-22 13:29:23 +01:00
ic_copy.png	added menu item icons in material style for multi select display	2016-06-24 12:11:31 +02:00
ic_delete.png	added menu item icons in material style for multi select display	2016-06-24 12:11:31 +02:00
ic_export.png	added menu item icons in material style for multi select display	2016-06-24 12:11:31 +02:00
ic_folder_open.png	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
ic_group.png	user/group icon work	2016-03-22 13:29:23 +01:00
ic_hide.png	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
ic_import.png	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
ic_lock.png	reverted back to light colored login	2015-08-18 17:48:10 +02:00
ic_lock_open.png	reverted back to light colored login	2015-08-18 17:48:10 +02:00
ic_log.png	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
ic_menu_archive.png	adjusting the icon work to nextcloud + high resolution images	2016-06-09 17:52:37 +02:00
ic_navigate_next.png	Polish UI to edit permissions	2016-01-11 15:34:41 +01:00
ic_ok.png	reverted back to light colored login	2015-08-18 17:48:10 +02:00
ic_open_in_app.png	new open in app icon during multi select	2016-06-30 10:53:57 +02:00
ic_pencil.png	added menu item icons in material style for multi select display	2016-06-24 12:11:31 +02:00
ic_play_arrow.png	material style play icon added	2016-02-12 12:50:00 +01:00
ic_refresh.png	fixed ic_refresh icon work with 24dp origial grey600 version	2016-02-15 17:34:45 +01:00
ic_search.png	magnify/close icon work	2016-03-22 13:29:23 +01:00
ic_select_all.png	added the ability to select all within a folder for upload - selection is discarded when navigating folders	2016-06-22 16:43:23 +02:00
ic_select_none.png	added the ability to select all within a folder for upload - selection is discarded when navigating folders	2016-06-22 16:43:23 +02:00
ic_settings.png	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
ic_share.png	added menu item icons in material style for multi select display	2016-06-24 12:11:31 +02:00
ic_sort_variant.png	added sorting icon from material, spring cleaning in lower resolution icons and obsolete Android versions	2016-02-25 18:07:29 +01:00
ic_uploads.png	Add 'Uploads' option into NavigationDrawer	2015-12-11 08:43:33 +01:00
ic_user.png	user/group icon work	2016-03-22 13:29:23 +01:00
ic_view.png	initial material design changes for the action bar	2015-07-26 01:49:27 +02:00
ic_warning.png	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
no_network.png	reverted back to light colored login	2015-08-18 17:48:10 +02:00
notification_icon.png	nextcloud notification icon	2016-06-09 17:52:37 +02:00
owncloud_progress_bg_light.9.png	added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore	2015-07-26 17:52:29 +02:00
owncloud_progress_primary_light.9.png	added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore	2015-07-26 17:52:29 +02:00
owncloud_progress_secondary_light.9.png	added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore	2015-07-26 17:52:29 +02:00
owncloud_progressbar_indeterminate_1.png	changed progress bar coloring	2016-06-07 11:09:41 +02:00
owncloud_progressbar_indeterminate_2.png	changed progress bar coloring	2016-06-07 11:09:41 +02:00
owncloud_progressbar_indeterminate_3.png	changed progress bar coloring	2016-06-07 11:09:41 +02:00
owncloud_progressbar_indeterminate_4.png	changed progress bar coloring	2016-06-07 11:09:41 +02:00
owncloud_progressbar_indeterminate_5.png	changed progress bar coloring	2016-06-07 11:09:41 +02:00
owncloud_progressbar_indeterminate_6.png	changed progress bar coloring	2016-06-07 11:09:41 +02:00
owncloud_progressbar_indeterminate_7.png	changed progress bar coloring	2016-06-07 11:09:41 +02:00
owncloud_progressbar_indeterminate_8.png	changed progress bar coloring	2016-06-07 11:09:41 +02:00
shared_via_link.png	adjusting the icon work to nextcloud + high resolution images	2016-06-09 17:52:37 +02:00
shared_via_users.png	adjusting the icon work to nextcloud + high resolution images	2016-06-09 17:52:37 +02:00
shared_with_me_folder.png	adjusting the icon work to nextcloud + high resolution images	2016-06-09 17:52:37 +02:00