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

Commit a01d0c00 authored by François Degros's avatar François Degros
Browse files

Rename "Compress" menu item to "Zip" 

Bug: 381005156
Test: Manual
Flag: com.android.documentsui.flags.use_material3
Flag: com.android.documentsui.flags.zip_ng_ro
Change-Id: I5b36df9b4dbe5ce44316acffa39b92a99c1bc63a
parent 594b8802

res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,8 @@ 
    <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 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 zips the selected documents and creates an archive in the current directory [CHAR LIMIT=28] -->

    <string name="menu_zip">Zip</string>

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

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

    <string name="menu_extract">Extract to\u2026</string>

    <string name="menu_extract">Extract to\u2026</string>

    <!-- Menu item title that extracts all the documents in the current directory [CHAR LIMIT=28] -->

    <!-- Menu item title that extracts all the documents in the current directory [CHAR LIMIT=28] -->

src/com/android/documentsui/MenuManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -394,8 +394,8 @@ public abstract class MenuManager { 
        Menus.setEnabledAndVisible(copyTo, false);

        Menus.setEnabledAndVisible(copyTo, false);

    }

    }





    protected void updateCompress(MenuItem compress, SelectionDetails selectionDetails) {

    protected void updateCompress(@NonNull MenuItem it, @NonNull SelectionDetails selection) {

        Menus.setEnabledAndVisible(compress, false);

        Menus.setEnabledAndVisible(it, false);

    }

    }





    protected void updateExtractTo(MenuItem extractTo, SelectionDetails selectionDetails) {

    protected void updateExtractTo(MenuItem extractTo, SelectionDetails selectionDetails) {

src/com/android/documentsui/files/MenuManager.java

+5 −6
Original line number Original line Diff line number Diff line
@@ -228,12 +228,11 @@ public final class MenuManager extends com.android.documentsui.MenuManager { 
    }

    }





    @Override

    @Override

    protected void updateCompress(MenuItem compress, SelectionDetails selectionDetails) {

    protected void updateCompress(@NonNull MenuItem it, @NonNull SelectionDetails selection) {

        final boolean readOnly = !mDirDetails.canCreateDoc();

        final boolean enabled = mFeatures.isArchiveCreationEnabled() && mDirDetails.canCreateDoc()

        Menus.setEnabledAndVisible(compress, mFeatures.isArchiveCreationEnabled()

                && !selection.containsPartialFiles() && !selection.canExtract();

                && !readOnly

        Menus.setEnabledAndVisible(it, enabled);

                && !selectionDetails.containsPartialFiles()

        if (enabled && isZipNgFlagEnabled()) it.setTitle(getRes(R.string.menu_zip));

                && !selectionDetails.canExtract());

    }

    }





    @Override

    @Override