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

Commit 961af181 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add "Compress" menu item to context menu" into main

parents 84984311 a0ba19d9

res/menu/dir_context_menu.xml

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
        <item

            android:id="@+id/dir_menu_copy_to_clipboard"

            android:title="@string/menu_copy_to_clipboard" />

        <item

            android:id="@+id/dir_menu_compress"

            android:title="@string/menu_compress" />

        <item

            android:id="@+id/dir_menu_paste_into_folder"

            android:title="@string/menu_paste_into_folder" />
@@ -47,6 +50,7 @@ 
            android:id="@+id/dir_menu_delete"

            android:title="@string/menu_delete" />

    </group>



    <group

        android:id="@+id/menu_extras_group">

        <item

res/menu/file_context_menu.xml

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ 
        <item

            android:id="@+id/dir_menu_copy_to_clipboard"

            android:title="@string/menu_copy_to_clipboard" />

        <item

            android:id="@+id/dir_menu_compress"

            android:title="@string/menu_compress" />

    </group>



    <group
@@ -49,6 +52,7 @@ 
            android:id="@+id/dir_menu_delete"

            android:title="@string/menu_delete" />

    </group>



    <group

        android:id="@+id/menu_extras_group">

        <item

res/menu/mixed_context_menu.xml

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
        <item

            android:id="@+id/dir_menu_copy_to_clipboard"

            android:title="@string/menu_copy_to_clipboard" />

        <item

            android:id="@+id/dir_menu_compress"

            android:title="@string/menu_compress" />

    </group>



    <group
@@ -34,6 +37,7 @@ 
            android:id="@+id/dir_menu_delete"

            android:title="@string/menu_delete" />

    </group>



    <group

        android:id="@+id/menu_extras_group">

        <item

src/com/android/documentsui/MenuManager.java

+5 −0
Original line number Diff line number Diff line
@@ -213,6 +213,11 @@ public abstract class MenuManager { 
        Menus.setEnabledAndVisible(delete, canDelete);



        Menus.setEnabledAndVisible(inspect, selectionDetails.size() == 1);



        final MenuItem compress = menu.findItem(R.id.dir_menu_compress);

        if (compress != null) {

            updateCompress(compress, selectionDetails);

        }

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On 
            // Need to plum down into handling the way we do with deleteDocuments.

            mActionModeController.finishActionMode();

            return true;

        } else if (id == R.id.action_menu_compress) {

        } else if (id == R.id.action_menu_compress || id == R.id.dir_menu_compress) {

            transferDocuments(selection, mState.stack,

                    FileOperationService.OPERATION_COMPRESS);

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