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
..
account_picker_long_click.xml	Update year in license	2015-03-05 13:27:45 +01:00
file_actions_menu.xml	new open in app icon during multi select	2016-06-30 10:53:57 +02:00
main_menu.xml	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
upload_files_picker.xml	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
upload_list_menu.xml	Refactor clear options for uploads avoiding clear the current ones	2016-03-18 09:22:42 +01:00