diff options
| author | 2015-11-05 04:02:36 +0000 | |
|---|---|---|
| committer | 2015-11-05 04:02:36 +0000 | |
| commit | b29cb7c9ae58d182ceb6dcadb1fa3f37736dc82e (patch) | |
| tree | 807befccbadcb6320f00817315308bfa94d720a6 | |
| parent | 1b2c41cd6cad01a49381b4d0583d39ad1c6addab (diff) | |
| parent | 261b6bdd36ab2b820f1646b3eaa5f4a3123a7bcf (diff) | |
Merge "Remove TRANSFER_MODE_NONE from CopyManager."
4 files changed, 3 insertions, 4 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java index c62f61945b58..55a123f8445a 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java +++ b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java @@ -66,7 +66,6 @@ public class CopyService extends IntentService { public static final String EXTRA_FAILURE = "com.android.documentsui.FAILURE"; public static final String EXTRA_TRANSFER_MODE = "com.android.documentsui.TRANSFER_MODE"; - public static final int TRANSFER_MODE_NONE = 0; public static final int TRANSFER_MODE_COPY = 1; public static final int TRANSFER_MODE_MOVE = 2; diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index 403a464fb51b..13c481c14dcf 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -176,7 +176,7 @@ public class DocumentsActivity extends BaseActivity { state.directoryCopy = intent.getBooleanExtra( BaseActivity.DocumentsIntent.EXTRA_DIRECTORY_COPY, false); state.transferMode = intent.getIntExtra(CopyService.EXTRA_TRANSFER_MODE, - CopyService.TRANSFER_MODE_NONE); + CopyService.TRANSFER_MODE_COPY); } return state; diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java index c7cffed91a96..840f7fa4c92f 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java @@ -122,7 +122,7 @@ public class FilesActivity extends BaseActivity { // Show a failure dialog if there was a failed operation. final int failure = intent.getIntExtra(CopyService.EXTRA_FAILURE, 0); final int transferMode = intent.getIntExtra(CopyService.EXTRA_TRANSFER_MODE, - CopyService.TRANSFER_MODE_NONE); + CopyService.TRANSFER_MODE_COPY); if (failure != 0) { final ArrayList<DocumentInfo> failedSrcList = intent.getParcelableArrayListExtra(CopyService.EXTRA_SRC_LIST); diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index e1f5ee16d29b..108d5e831c27 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -487,7 +487,7 @@ public class DirectoryFragment extends Fragment { CopyService.start(getActivity(), getDisplayState(this).selectedDocumentsForCopy, (DocumentStack) data.getParcelableExtra(Shared.EXTRA_STACK), - data.getIntExtra(CopyService.EXTRA_TRANSFER_MODE, CopyService.TRANSFER_MODE_NONE)); + data.getIntExtra(CopyService.EXTRA_TRANSFER_MODE, CopyService.TRANSFER_MODE_COPY)); } private int getEventAdapterPosition(MotionEvent e) { |