Commit graph

127 commits

Author SHA1 Message Date
AndyScherzinger
4796633bcd
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-06 22:47:02 +02:00
Joe Apicella
2b2916a49a add grid view option when choosing a file from within the app 2016-10-01 16:03:59 -07:00
Andy Scherzinger
30669c9677 initial navigation setup for menu and activity 2016-09-26 17:59:14 +02:00
Andy Scherzinger
f4036c52b4 fix CR 2016-09-18 16:11:01 +02:00
Andy Scherzinger
193f9a19c4 hide menu items in overflow menu in CAB 2016-09-18 16:00:29 +02:00
tobiasKaminsky
9d10864a87 change caption for move and copy action 2016-09-17 18:10:33 +02:00
Andy Scherzinger
07f5d9546e revamped participation activity content based on the feedback 2016-09-06 19:36:02 +02:00
Andy Scherzinger
660e5a8923 fix for triggering the main drawer menu items from "participate", changed participate icon and checkable behavior, don't show settings etc when showing accounts 2016-09-06 17:25:57 +02:00
Andy Scherzinger
7f200c5f1a participate icon 2016-09-06 17:25:57 +02:00
tobiasKaminsky
a24f89be16 wip 2016-09-06 17:25:57 +02:00
Andy Scherzinger
e790d4a520 initial layout changes for in drawer quota display 2016-08-18 15:55:11 +02:00
Andy Scherzinger
5518e8257e hide non-primary action menu items in overflow menu 2016-08-03 19:20:44 +02:00
Andy Scherzinger
b869538846 added description and went for ifRoom 2016-08-03 19:20:44 +02:00
Andy Scherzinger
14be68d4b1 fix UI behavior for filtering in upload view 2016-08-03 19:20:44 +02:00
Andy Scherzinger
4c6f1c0faa correct search view UI-behavior 2016-08-03 19:20:44 +02:00
tobiasKaminsky
a3a6420ead filter for oc file list and local file list 2016-08-03 19:20:44 +02:00
tobiasKaminsky
98a679548a Merge remote-tracking branch 'remotes/origin/master' into multiSelectNew 2016-07-15 18:32:56 +02:00
Andy Scherzinger
55e088e33a renamed icon, fixed string ref for Uploads drawer item 2016-07-14 22:43:19 +02:00
Andy Scherzinger
9c76e2828c proper on device icon 2016-07-14 22:42:24 +02:00
Andy Scherzinger
a33a03a928 adaption after rebase to switch between all/offline files 2016-07-14 22:42:23 +02:00
Andy Scherzinger
d00893c66a Merge pull request #124 from nextcloud/sortInUploadFilesActivity
Sort in upload files activity
2016-07-14 22:38:04 +02:00
Andy Scherzinger
19b711f2d8 cleanup menus 2016-07-14 14:48:22 +02:00
tobiasKaminsky
4c20679538 add sort to UploadFileActiviy 2016-07-14 14:31:46 +02:00
Andy Scherzinger
ef031c6c65 further icon fixed and completion of all custom/internal icons, so no references to OS version specific icon works anymore 2016-07-14 14:12:34 +02:00
David A. Velasco
5fdd54fc11 Added set/unset available offline action icons for tablets ignoring 'showAsAction=never' when action is the only one in the overflow menu 2016-07-12 19:26:43 +02:00
David A. Velasco
c86b0c5c6b No legacy icon in action bar 2016-07-12 15:31:49 +02:00
David A. Velasco
25f623be8f New 'move' icon; fixed hdpi, mdpi icons 2016-07-12 15:31:48 +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
Andy Scherzinger
5d7c1f31e7 new open in app icon during multi select 2016-06-30 10:53:57 +02:00
Andy Scherzinger
06dc13601e drawer preparations for "On Device" menu item 2016-06-25 16:27:15 +02:00
Andy Scherzinger
f7178fa837 housekeeping Preferences, removed all accounts related code 2016-06-25 16:26:57 +02:00
Andy Scherzinger
f41e567b90 general menu/account list switch implemented (open: populate account list) 2016-06-25 16:26:47 +02:00
Andy Scherzinger
ed33c0aff4 initial rewrite to make use of the toolbar 2016-06-25 16:26:44 +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
dd5cb1ad6a Disable favorite actions from multiple context menu 2016-06-24 12:11:31 +02:00
tobiasKaminsky
3f108e7a52 changes according to CR 2016-06-24 12:11:31 +02:00
Andy Scherzinger
e7fa658994 added menu item icons in material style for multi select display 2016-06-24 12:11:31 +02:00
tobiasKaminsky
d142cca6ab wip 2016-06-24 12:11:31 +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
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
Juan Carlos González Cabrero
f150dce25c Refactor clear options for uploads avoiding clear the current ones 2016-03-18 09:22:42 +01:00
David A. Velasco
259c94a45b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-15 09:48:12 +01:00
masensio
573d94453b Delete context menu in UploadListFragment 2016-02-26 14:34:41 +01:00
Andy Scherzinger
5e9bf598f3 force all menu items into the overflow menu (see discussion https://github.com/owncloud/android/issues/1232#issuecomment-153075076) 2016-02-25 18:15:00 +01:00
Andy Scherzinger
d7ff626db3 added sorting icon from material, spring cleaning in lower resolution icons and obsolete Android versions 2016-02-25 18:07:29 +01:00
Juan Carlos González Cabrero
9fe62d15ea Refresh listview when clear failed/finished uploads clicked 2016-02-15 10:58:53 +01:00
masensio
2181239c6d Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-01-08 11:21:23 +01:00
David A. Velasco
d26da3cbc2 Recovered changes lost in complex rebase 2016-01-05 12:12:18 +01:00
tobiasKaminsky
2586298380 moved switch menu item to three dots menu 2016-01-05 11:21:37 +01:00
tobiasKaminsky
6bd7065c73 wip 2016-01-05 11:16:00 +01:00