Merge "Fix copying folders using keyboard shortcuts" into nyc-dev (a7329c51) · Commits · e / os / android_frameworks_base

packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1049,7 +1049,7 @@ public class DirectoryFragment extends Fragment
		}

		// Can't copy folders to downloads, because we don't show folders there.
		if (!root.isDownloads()) {
		if (root.isDownloads()) {
		for (DocumentInfo docs : files) {
		if (docs.isDirectory()) {
		return false;

+3 −3

Original line number	Diff line number	Diff line
		@@ -158,11 +158,11 @@ public final class FileOperations {
		}

		/**
		* Starts the service for a move operation.
		* Starts the service for a delete operation.
		*
		* @param jobId A unique jobid for this job.
		* Use {@link #createJobId} if you don't have one handy.
		* @param srcDocs A list of src files to copy.
		* @param srcDocs A list of src files to delete.
		* @param srcParent Parent of all the source documents.
		* @return Id of the job.
		*/
		@@ -184,7 +184,7 @@ public final class FileOperations {
		*
		* @param jobId A unique jobid for this job.
		* Use {@link #createJobId} if you don't have one handy.
		* @param srcDocs A list of src files to copy.
		* @param srcDocs A list of src files for an operation.
		* @return Id of the job.
		*/
		public static Intent createBaseIntent(