nextcloud-android/res/drawable
masensio dc0aea30f0 Merge branch 'master' into reliable_uploads
Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/db/ProviderMeta.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/utils/FileStorageUtils.java
2015-12-10 17:18:52 +01:00
..
action_item_btn.xml Update year in license 2015-03-05 13:27:45 +01:00
action_item_selected.9.png initial commit 2011-08-19 22:37:35 +02:00
actionbar_progress_horizontal.xml fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment 2015-08-04 18:32:33 +02:00
actionbar_progress_indeterminate_horizontal.xml progress bar drawable definitions (forgot to commit earlier) 2015-07-26 18:36:29 +02:00
arrow_down.png initial commit 2011-08-19 22:37:35 +02:00
arrow_up.png initial commit 2011-08-19 22:37:35 +02:00
backrepeat.xml add checker background pattern for all png images. 2015-07-11 09:18:26 +02:00
btn.xml Update year in license 2015-03-05 13:27:45 +01:00
btn_cancel.png Cancel button for downloads in progress replaceed with 'x' icon 2013-06-05 11:08:33 +02:00
btn_round.xml Update year in license 2015-03-05 13:27:45 +01:00
btn_round_pressed.xml Update year in license 2015-03-05 13:27:45 +01:00
btn_small_round.xml added right button for items in upload list (for cancel, retry, and remove) 2014-12-12 10:59:44 +01:00
checker_16_16.png add missing checker pattern 2015-07-11 09:40:06 +02:00
common_error.png adjusting design to holo, stability for account setup 2012-05-13 16:13:13 +02:00
conflict_file_indicator.png Persist conflicts in local database and show with an icon in the list of files 2015-09-25 15:13:46 +02:00
downloading_file_indicator.png Update some icons 2015-01-30 11:00:14 +01:00
header.png initial commit 2011-08-19 22:37:35 +02:00
ic_hide.png Placeholder drawable for 'hide password' button replace with the final icon 2013-05-24 12:47:39 +02:00
ic_ok.png adjusting design to holo, stability for account setup 2012-05-13 16:13:13 +02:00
ic_view.png Placeholder drawable for 'hide password' button replace with the final icon 2013-05-24 12:47:39 +02:00
list_selector.xml Update year in license 2015-03-05 13:27:45 +01:00
local_file_indicator.png Change the star and downloaded/downloading/uploading icons in list_item layout desing 2014-07-09 09:09:37 +02:00
main_header_bg.xml Update year in license 2015-03-05 13:27:45 +01:00
no_network.png adjusting design to holo, stability for account setup 2012-05-13 16:13:13 +02:00
popup.9.png initial commit 2011-08-19 22:37:35 +02:00
process_dialog_background.xml fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle 2015-08-18 22:09:53 +02:00
progress_small.xml Update year in license 2015-03-05 13:27:45 +01:00
spinner_inner.png adjusting design to holo, stability for account setup 2012-05-13 16:13:13 +02:00
split_action_bg.xml Update year in license 2015-03-05 13:27:45 +01:00
synchronizing_file_indicator.png Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside 2015-09-25 15:13:38 +02:00
upload_failed.png change upload list layout according to https://github.com/owncloud/android/issues/765#issuecomment-65076426 2014-12-08 17:03:46 +01:00
upload_finished.png change upload list layout according to https://github.com/owncloud/android/issues/765#issuecomment-65076426 2014-12-08 17:03:46 +01:00
upload_in_progress.png change upload list layout according to https://github.com/owncloud/android/issues/765#issuecomment-65076426 2014-12-08 17:03:46 +01:00
uploader_list_separator.xml Update year in license 2015-03-05 13:27:45 +01:00
uploading_file_indicator.png Change the star and downloaded/downloading/uploading icons in list_item layout desing 2014-07-09 09:09:37 +02:00