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

Commit 3c243e41 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Handle delete failure notifications correctly." into nyc-dev

parents 6706a834 4941392d

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ 
    <string name="copy_failure_alert_content">These files weren\u2019t copied: <xliff:g id="list">%1$s</xliff:g></string>

    <!-- Contents of the moving failure alert dialog. [CHAR LIMIT=48] -->

    <string name="move_failure_alert_content">These files weren\u2019t moved: <xliff:g id="list">%1$s</xliff:g></string>

    <!-- Message shown to users when an operation to delete one or more files has failed. Presented in a dialog. [CHAR LIMIT=48] -->

    <string name="delete_failure_alert_content">These files weren\u2019t deleted: <xliff:g id="list">%1$s</xliff:g></string>

    <!-- Contents of the copying warning dialog due to converted files. [CHAR LIMIT=64] -->

    <string name="copy_converted_warning_content">These files were converted to another format: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></string>

    <!-- Toast shown when a user copies files to clipboard. -->

src/com/android/documentsui/OperationDialogFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ public class OperationDialogFragment extends DialogFragment { 
                    case FileOperationService.OPERATION_COPY:

                        messageFormat = getString(R.string.copy_failure_alert_content);

                        break;

                    case FileOperationService.OPERATION_DELETE:

                        messageFormat = getString(R.string.delete_failure_alert_content);

                        break;

                    case FileOperationService.OPERATION_MOVE:

                        messageFormat = getString(R.string.move_failure_alert_content);

                        break;

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

+1 −2
Original line number Diff line number Diff line
@@ -497,8 +497,7 @@ public class DirectoryFragment extends Fragment 
            if ((docFlags & Document.FLAG_PARTIAL) != 0) {

                mNoCopyCount += selected ? 1 : -1;

            }

            if ((docFlags & Document.FLAG_SUPPORTS_DELETE) == 0

                    && (docFlags & Document.FLAG_SUPPORTS_DELETE) == 0) {

            if ((docFlags & Document.FLAG_SUPPORTS_DELETE) == 0) {

                mNoDeleteCount += selected ? 1 : -1;

            }

            if ((docFlags & Document.FLAG_SUPPORTS_RENAME) != 0) {