Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove TRANSFER_MODE_NONE from CopyManager."

Browse Source
This commit is contained in:
Tomasz Mikolajewski
2015-11-05 04:02:36 +00:00
committed by Android (Google) Code Review
parent 1b2c41cd6c 261b6bdd36
commit b29cb7c9ae
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/DocumentsUI/src/com/android/documentsui/CopyService.java
View File

@@ -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;

2
packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
View File

@@ -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;

2
packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
View File

@@ -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);

2
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
View File

@@ -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) {