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

Commit 2e8acf01 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski
Browse files

Remove "Compress To". 

Test: Unit tests.
Bug: 35180990
Change-Id: I57d9164e012f842f90e8a8140df6d839261a1432
(cherry picked from commit 49cd92dd)
parent 26640ab7

res/menu/mode_directory.xml

+0 −5
Original line number Original line Diff line number Diff line
@@ -50,11 +50,6 @@ 
        android:title="@string/menu_move"

        android:title="@string/menu_move"

        android:showAsAction="never"

        android:showAsAction="never"

        android:visible="false" />

        android:visible="false" />

    <item

        android:id="@+id/menu_compress_to"

        android:title="@string/menu_compress_to"

        android:showAsAction="never"

        android:visible="false" />

    <item

    <item

        android:id="@+id/menu_compress"

        android:id="@+id/menu_compress"

        android:title="@string/menu_compress"

        android:title="@string/menu_compress"

res/values/strings.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -52,8 +52,6 @@ 
    <string name="menu_copy">Copy to\u2026</string>

    <string name="menu_copy">Copy to\u2026</string>

    <!-- Menu item title that moves the selected documents [CHAR LIMIT=28] -->

    <!-- Menu item title that moves the selected documents [CHAR LIMIT=28] -->

    <string name="menu_move">Move to\u2026</string>

    <string name="menu_move">Move to\u2026</string>

    <!-- Menu item title that compresses the selected documents to the user selected directory [CHAR LIMIT=28] -->

    <string name="menu_compress_to">Compress to\u2026</string>

    <!-- Menu item title that compresses the selected documents to the current directory [CHAR LIMIT=28] -->

    <!-- Menu item title that compresses the selected documents to the current directory [CHAR LIMIT=28] -->

    <string name="menu_compress">Compress</string>

    <string name="menu_compress">Compress</string>

    <!-- Menu item title that extracts the selected documents [CHAR LIMIT=28] -->

    <!-- Menu item title that extracts the selected documents [CHAR LIMIT=28] -->

src/com/android/documentsui/MenuManager.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ public abstract class MenuManager { 
        updateSelectAll(menu.findItem(R.id.menu_select_all));

        updateSelectAll(menu.findItem(R.id.menu_select_all));

        updateMoveTo(menu.findItem(R.id.menu_move_to), selection);

        updateMoveTo(menu.findItem(R.id.menu_move_to), selection);

        updateCopyTo(menu.findItem(R.id.menu_copy_to), selection);

        updateCopyTo(menu.findItem(R.id.menu_copy_to), selection);

        updateCompressTo(menu.findItem(R.id.menu_compress_to), selection);

        updateCompress(menu.findItem(R.id.menu_compress), selection);

        updateCompress(menu.findItem(R.id.menu_compress), selection);

        updateExtractTo(menu.findItem(R.id.menu_extract_to), selection);

        updateExtractTo(menu.findItem(R.id.menu_extract_to), selection);
@@ -272,10 +271,6 @@ public abstract class MenuManager { 
        copyTo.setVisible(false);

        copyTo.setVisible(false);

    }

    }





    protected void updateCompressTo(MenuItem compressTo, SelectionDetails selectionDetails) {

        compressTo.setVisible(false);

    }



    protected void updateCompress(MenuItem compress, SelectionDetails selectionDetails) {

    protected void updateCompress(MenuItem compress, SelectionDetails selectionDetails) {

        compress.setVisible(false);

        compress.setVisible(false);

    }

    }

src/com/android/documentsui/Metrics.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -305,7 +305,7 @@ public final class Metrics { 
    public static final int USER_ACTION_HIDE_SIZE = 9;

    public static final int USER_ACTION_HIDE_SIZE = 9;

    public static final int USER_ACTION_SETTINGS = 10;

    public static final int USER_ACTION_SETTINGS = 10;

    public static final int USER_ACTION_COPY_TO = 11;

    public static final int USER_ACTION_COPY_TO = 11;

    public static final int USER_ACTION_COMPRESS_TO = 27;

    public static final int USER_ACTION_COMPRESS = 27;

    public static final int USER_ACTION_EXTRACT_TO = 28;

    public static final int USER_ACTION_EXTRACT_TO = 28;

    public static final int USER_ACTION_MOVE_TO = 12;

    public static final int USER_ACTION_MOVE_TO = 12;

    public static final int USER_ACTION_DELETE = 13;

    public static final int USER_ACTION_DELETE = 13;
@@ -335,7 +335,7 @@ public final class Metrics { 
            USER_ACTION_HIDE_SIZE,

            USER_ACTION_HIDE_SIZE,

            USER_ACTION_SETTINGS,

            USER_ACTION_SETTINGS,

            USER_ACTION_COPY_TO,

            USER_ACTION_COPY_TO,

            USER_ACTION_COMPRESS_TO,

            USER_ACTION_COMPRESS,

            USER_ACTION_EXTRACT_TO,

            USER_ACTION_EXTRACT_TO,

            USER_ACTION_MOVE_TO,

            USER_ACTION_MOVE_TO,

            USER_ACTION_DELETE,

            USER_ACTION_DELETE,

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

+1 −8
Original line number Original line Diff line number Diff line
@@ -626,13 +626,6 @@ public class DirectoryFragment extends Fragment 
                mActionModeController.finishActionMode();

                mActionModeController.finishActionMode();

                return true;

                return true;





            case R.id.menu_compress_to:

                transferDocuments(selection, null, FileOperationService.OPERATION_COMPRESS);

                // TODO: Only finish selection mode if compress-to is not canceled.

                // Need to plum down into handling the way we do with deleteDocuments.

                mActionModeController.finishActionMode();

                return true;



            // TODO: Implement extract (to the current directory).

            // TODO: Implement extract (to the current directory).

            case R.id.menu_extract_to:

            case R.id.menu_extract_to:

                transferDocuments(selection, null, FileOperationService.OPERATION_EXTRACT);

                transferDocuments(selection, null, FileOperationService.OPERATION_EXTRACT);
@@ -729,7 +722,7 @@ public class DirectoryFragment extends Fragment 
                Metrics.logUserAction(getContext(), Metrics.USER_ACTION_COPY_TO);

                Metrics.logUserAction(getContext(), Metrics.USER_ACTION_COPY_TO);

                break;

                break;

            case FileOperationService.OPERATION_COMPRESS:

            case FileOperationService.OPERATION_COMPRESS:

                Metrics.logUserAction(getContext(), Metrics.USER_ACTION_COMPRESS_TO);

                Metrics.logUserAction(getContext(), Metrics.USER_ACTION_COMPRESS);

                break;

                break;

            case FileOperationService.OPERATION_EXTRACT:

            case FileOperationService.OPERATION_EXTRACT:

                Metrics.logUserAction(getContext(), Metrics.USER_ACTION_EXTRACT_TO);

                Metrics.logUserAction(getContext(), Metrics.USER_ACTION_EXTRACT_TO);