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

Commit 08d4d05c authored by wilsonshih's avatar wilsonshih
Browse files

Hide 'Open' option for context menu for files. 

User can use 'Open with' option or double click to open an app in file management mode.

Change-Id: I7bbe8097bb7a421f54a9e629c779692eba6a05f2
Fixes:70506710
Test: Menu test. Check there is no 'Open' option on context menu when mouse right click on file.
parent 9ed022ba

src/com/android/documentsui/MenuManager.java

+4 −2
Original line number Diff line number Diff line
@@ -321,8 +321,10 @@ public abstract class MenuManager { 
        pasteInto.setVisible(false);

    }



    protected abstract void updateOpenInContextMenu(

            MenuItem open, SelectionDetails selectionDetails);

    protected void updateOpenInContextMenu(MenuItem open, SelectionDetails selectionDetails) {

        open.setVisible(false);

    }



    protected abstract void updateSelectAll(MenuItem selectAll);

    protected abstract void updateCreateDir(MenuItem createDir);

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

+0 −7
Original line number Diff line number Diff line
@@ -163,13 +163,6 @@ public final class MenuManager extends com.android.documentsui.MenuManager { 
        newWindow.setVisible(true);

    }



    @Override

    protected void updateOpenInContextMenu(MenuItem open, SelectionDetails selectionDetails) {

        open.setVisible(true);

        open.setEnabled(selectionDetails.size() == 1

                && !selectionDetails.containsPartialFiles());

    }



    @Override

    protected void updateOpenWith(MenuItem openWith, SelectionDetails selectionDetails) {

        openWith.setVisible(true);

tests/functional/com/android/documentsui/ContextMenuUiTest.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class ContextMenuUiTest extends ActivityTest<FilesActivity> { 


    public void testContextMenu_onFile() throws Exception {

        menuItems.put("Share", true);

        menuItems.put("Open", true);

        menuItems.put("Open", false);

        menuItems.put("Open with", true);

        menuItems.put("Cut", true);

        menuItems.put("Copy", true);

tests/unit/com/android/documentsui/files/MenuManagerTest.java

+2 −4
Original line number Diff line number Diff line
@@ -567,8 +567,7 @@ public final class MenuManagerTest { 
    public void testContextMenu_OnFile() {

        selectionDetails.size = 1;

        mgr.updateContextMenuForFiles(testMenu, selectionDetails);

        dirOpen.assertVisible();

        dirOpen.assertEnabled();

        dirOpen.assertInvisible();

        dirCutToClipboard.assertVisible();

        dirCopyToClipboard.assertVisible();

        dirRename.assertVisible();
@@ -596,8 +595,7 @@ public final class MenuManagerTest { 
    public void testContextMenu_OnMultipleFiles() {

        selectionDetails.size = 3;

        mgr.updateContextMenuForFiles(testMenu, selectionDetails);

        dirOpen.assertVisible();

        dirOpen.assertDisabled();

        dirOpen.assertInvisible();

    }



    @Test