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

Commit 920868dc authored by Bill Lin's avatar Bill Lin
Browse files

Refactor DocumentsUI MenuManager and clean un-used code 

Remove Open Menu and OpenInActionMode relative function

Test: atest DocumentsUITests
Change-Id: I89cc5214dcd52270414f38a53aedbc95ff07486e
Fix: 110131388
parent fd235cff

res/menu/action_mode_menu.xml

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
-->



<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/action_menu_open"

        android:title="@string/menu_open"

        android:showAsAction="always" />

    <item

        android:id="@+id/action_menu_open_with"

        android:title="@string/menu_open_with"

src/com/android/documentsui/MenuManager.java

+0 −5
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ public abstract class MenuManager { 


    /** @see ActionModeController */

    public void updateActionMenu(Menu menu, SelectionDetails selection) {

        updateOpenInActionMode(menu.findItem(R.id.action_menu_open), selection);

        updateOpenWith(menu.findItem(R.id.action_menu_open_with), selection);

        updateDelete(menu.findItem(R.id.action_menu_delete), selection);

        updateShare(menu.findItem(R.id.action_menu_share), selection);
@@ -249,10 +248,6 @@ public abstract class MenuManager { 
        newWindow.setVisible(false);

    }



    protected void updateOpenInActionMode(MenuItem open, SelectionDetails selectionDetails) {

        open.setVisible(false);

    }



    protected void updateSelect(MenuItem select, SelectionDetails selectionDetails) {

        select.setVisible(false);

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -639,7 +639,6 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On 
        mSelectionMgr.copySelection(selection);



        switch (item.getItemId()) {

            case R.id.action_menu_open:

            case R.id.action_menu_select:

            case R.id.dir_menu_open:

                openDocuments(selection);

tests/common/com/android/documentsui/testing/TestMenu.java

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ public abstract class TestMenu implements Menu { 
                R.id.root_menu_open_in_new_window,

                R.id.root_menu_paste_into_folder,

                R.id.root_menu_settings,

                R.id.action_menu_open,

                R.id.action_menu_open_with,

                R.id.action_menu_share,

                R.id.action_menu_delete,

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

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ public final class MenuManagerTest { 
        rootSettings = testMenu.findItem(R.id.root_menu_settings);



        // Menu actions (including overflow) when action mode *is* active.

        actionModeOpen = testMenu.findItem(R.id.action_menu_open);

        actionModeOpenWith = testMenu.findItem(R.id.action_menu_open_with);

        actionModeShare = testMenu.findItem(R.id.action_menu_share);

        actionModeDelete = testMenu.findItem(R.id.action_menu_delete);