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

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

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

parents 0cf69a96 5ca49482

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