Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b29cb7c9 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android (Google) Code Review
Browse files

Merge "Remove TRANSFER_MODE_NONE from CopyManager."

parents 1b2c41cd 261b6bdd

packages/DocumentsUI/src/com/android/documentsui/CopyService.java

+0 −1
Original line number Diff line number Diff line
@@ -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;

packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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) {