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

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

Conditionally show "Extract to" as an action or a menu item 

Only show the "Extract to" menu item as an action if the flag zip_ng_ro
is enabled.

Bug: 391983717
Flag: com.android.documentsui.flags.use_material3
Flag: com.android.documentsui.flags.zip_ng_ro
Test: Manual
Change-Id: I603d233c2958f8325c3b7458c148f17e5b9329e4
parent f0d52d9e

res/flag(com.android.documentsui.flags.use_material3)/menu/action_mode_menu.xml

+2 −2
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ 
        android:id="@+id/action_menu_extract_to"

        android:title="@string/menu_extract"

        android:icon="@drawable/ic_menu_extract"

        android:showAsAction="always"

        android:showAsAction="never"

        android:visible="false"

        app:showAsAction="always" />

        app:showAsAction="never" />

    <item

        android:id="@+id/action_menu_move_to"

        android:title="@string/menu_move"

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.documentsui.files; 


import static com.android.documentsui.util.FlagUtils.isDesktopFileHandlingFlagEnabled;

import static com.android.documentsui.util.FlagUtils.isVisualSignalsFlagEnabled;

import static com.android.documentsui.util.FlagUtils.isZipNgFlagEnabled;

import static com.android.documentsui.util.Material3Config.getRes;



import android.content.Context;
@@ -241,6 +242,7 @@ public final class MenuManager extends com.android.documentsui.MenuManager { 
    protected void updateExtractTo(MenuItem extractTo, SelectionDetails selectionDetails) {

        boolean enabled = selectionDetails.canExtract();

        Menus.setEnabledAndVisible(extractTo, enabled);

        if (isZipNgFlagEnabled()) extractTo.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

    }



    @Override