Commit graph

2836 commits

Author SHA1 Message Date
Andy Scherzinger
bca547621f merge conflict resolved 2016-07-09 20:45:58 +02:00
David A. Velasco
fdeff61ce2 Fixed life cycle of ExtendedListFragment (see #onCreateView method) so that selections are tracked in grid mode during rotations without tracking them in our code 2016-07-09 19:49:38 +02:00
David A. Velasco
0a4ac6e91c Update selection in FileListListAdapter using ID received from list instead of position, so that changes removals or additions in the list result in correct update of the drawn selection 2016-07-09 19:49:37 +02:00
David A. Velasco
db6acc6868 Clean-up and small refactorings
Conflicts:
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2016-07-09 19:49:37 +02:00
David A. Velasco
936c182c3a Fixed wrong onOptionsItemSelected implementations 2016-07-09 19:47:25 +02:00
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
jabarros
460e187713 Fix. Allow set multiple files as 'Available offline' 2016-06-30 13:02:29 +02:00
tobiasKaminsky
08a11dd660 Merge remote-tracking branch 'remotes/origin/master' into newMultiSelect 2016-06-25 10:30:05 +02:00
David Wiesner
4f7d3d4fd1 fix: GridView not restore selected positions but getCheckedItemCount ill return right value 2016-06-24 12:11:31 +02:00
David Wiesner
ad6a82e925 reset: autoformat imports 2016-06-24 12:11:31 +02:00
David Wiesner
c95245acf0 remove duplicate 2016-06-24 12:11:31 +02:00
David Wiesner
b142de752c reset: imports format 2016-06-24 12:11:31 +02:00
David Wiesner
3bf36dd5f0 remove duplicates 2016-06-24 12:11:31 +02:00
David Wiesner
659f280a8b build fixes 2016-06-24 12:11:31 +02:00
David Wiesner
dbccf34e8b rebase 2016-06-24 12:11:31 +02:00
David Wiesner
8aac596d72 remove unnecessary tests 2016-06-24 12:11:31 +02:00
David Wiesner
fda8708ce1 multi-select-fix-rotate-899 2016-06-24 12:11:31 +02:00
David Wiesner
a3fae49fbf multi-select-fix-rotate-899 2016-06-24 12:11:31 +02:00
David A. Velasco
7631bc24d3 Patch preventing crash during move of multiple files 2016-06-24 12:11:31 +02:00
David A. Velasco
301ec578bc Fix crash due to obsolete string resources 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
c6219c610f Update actions menu on creation, to avoid losing filtering state 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
00cd3e6199 Actions menu filtering based on all checked items 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
5adf2fc54c Remove manually destruction of the multiselect menu 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
9af6bf238c Remove deprecated code after last update 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
217a5e9825 Update menu filter on item checked state changed 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
03045c502d Add MultiChoiceModeListener for both listView and gridView 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
ba5eb293df Assignment not anonymous, and put back the Override annotations 2016-06-24 12:11:31 +02:00
Andy Scherzinger
424854875f show/hide logic for FAB during multi selection mode switching 2016-06-24 12:11:31 +02:00
Andy Scherzinger
98d4e4220e use actual checkbox icon work 2016-06-24 12:11:31 +02:00
tobiasKaminsky
3f108e7a52 changes according to CR 2016-06-24 12:11:31 +02:00
Andy Scherzinger
4380290d90 code review fixes 2016-06-24 12:11:31 +02:00
Andy Scherzinger
2e65ffcf4f grey system bar coloring on multi select 2016-06-24 12:11:31 +02:00
tobiasKaminsky
ad8c22cf20 fix for #1350 2016-06-24 12:11:31 +02:00
tobiasKaminsky
f7b73bff89 fix #1259 2016-06-24 12:11:31 +02:00
tobiasKaminsky
f1cba47d40 wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
d142cca6ab wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
5085a92760 wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
4d87dbfaf3 changed highlighted color 2016-06-24 12:11:31 +02:00
tobiasKaminsky
d761f24572 wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
ee01a1ad1d add missing files 2016-06-23 21:23:52 +02:00
tobiasKaminsky
1183e51c19 Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud
# Conflicts:
#	res/drawable-hdpi/ic_checkbox_marked.png
#	res/drawable-mdpi/ic_checkbox_marked.png
#	res/drawable-xhdpi/ic_checkbox_marked.png
#	res/drawable-xxhdpi/ic_checkbox_marked.png
#	res/layout/grid_image.xml
#	res/values/strings.xml
#	src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-06-23 21:10:58 +02:00
Andy Scherzinger
7b27691a49 Renames due to https://github.com/nextcloud/android-library/pull/3 2016-06-23 14:44:44 +02:00
Andy Scherzinger
4e554c9245 fixed code duplicate 2016-06-22 16:43:25 +02:00
Andy Scherzinger
0db9c5e72d fix code review comments 2016-06-22 16:43:24 +02:00
Andy Scherzinger
2c256bf53d 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
Bartosz Przybylski
6bab4f00f9 Review fixes 2016-06-20 22:15:03 +02:00
Andy Scherzinger
75e2659947 use proper app icon in documents provider 2016-06-20 22:15:02 +02:00
Bartosz Przybylski
db7a4641c2 Add documents provider 2016-06-20 22:15:02 +02:00
tobiasKaminsky
f1bd8fc59a linebreak 2016-06-19 21:24:59 +02:00
tobiasKaminsky
0e4243c996 hofix: https://github.com/nextcloud/server/pull/110 2016-06-19 21:24:36 +02:00