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

Commit fd235cff authored by Bill Lin's avatar Bill Lin
Browse files

Fine tune description for ACTION_GET_CONTENT/ACTION_OPEN 

User will confuse if menu title showing "Open" when file selected
However, AP may intent to get the URI of the selected files only,
Refactor "Open" to "Select" is more compatible for all use cases

Test: atest DocumentsUITests
      Manual test with Gmail/TestApp for attachments
Bug: 80112687
Bug: 110022264

Change-Id: I25f68b5436b5387d3c8e0dbfd7aec0269020cfec
parent 5d9eb1f8

res/menu/action_mode_menu.xml

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ 
        android:icon="@drawable/ic_menu_delete"

        android:title="@string/menu_delete"

        android:showAsAction="always" />

    <item

        android:id="@+id/action_menu_select"

        android:title="@string/menu_select"

        android:showAsAction="always" />

    <item

        android:id="@+id/action_menu_select_all"

        android:title="@string/menu_select_all"

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ 
    <string name="menu_delete">Delete</string>

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

    <string name="menu_select_all">Select all</string>

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

    <string name="menu_select">Select</string>

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

    <string name="menu_copy">Copy to\u2026</string>

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

src/com/android/documentsui/MenuManager.java

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ public abstract class MenuManager { 
        updateDelete(menu.findItem(R.id.action_menu_delete), selection);

        updateShare(menu.findItem(R.id.action_menu_share), selection);

        updateRename(menu.findItem(R.id.action_menu_rename), selection);

        updateSelect(menu.findItem(R.id.action_menu_select), selection);

        updateSelectAll(menu.findItem(R.id.action_menu_select_all));

        updateMoveTo(menu.findItem(R.id.action_menu_move_to), selection);

        updateCopyTo(menu.findItem(R.id.action_menu_copy_to), selection);
@@ -252,6 +253,10 @@ public abstract class MenuManager { 
        open.setVisible(false);

    }



    protected void updateSelect(MenuItem select, SelectionDetails selectionDetails) {

        select.setVisible(false);

    }



    protected void updateOpenWith(MenuItem openWith, SelectionDetails selectionDetails) {

        openWith.setVisible(false);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -640,6 +640,7 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On 


        switch (item.getItemId()) {

            case R.id.action_menu_open:

            case R.id.action_menu_select:

            case R.id.dir_menu_open:

                openDocuments(selection);

                mActionModeController.finishActionMode();

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

+5 −12
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.documentsui.queries.SearchViewManager; 


import java.util.List;

import java.util.function.IntFunction;

import com.android.documentsui.R;



public final class MenuManager extends com.android.documentsui.MenuManager {
@@ -86,18 +87,10 @@ public final class MenuManager extends com.android.documentsui.MenuManager { 
    }



    @Override

    protected void updateOpenInActionMode(MenuItem open, SelectionDetails selectionDetails) {

        updateOpen(open, selectionDetails);

    }



    @Override

    protected void updateOpenInContextMenu(MenuItem open, SelectionDetails selectionDetails) {

        updateOpen(open, selectionDetails);

    }



    private void updateOpen(MenuItem open, SelectionDetails selectionDetails) {

        open.setVisible(mState.action == ACTION_GET_CONTENT

    protected void updateSelect(MenuItem select, SelectionDetails selectionDetails) {

        select.setVisible(mState.action == ACTION_GET_CONTENT

                || mState.action == ACTION_OPEN);

        open.setEnabled(selectionDetails.size() > 0);

        select.setEnabled(selectionDetails.size() > 0);

        select.setTitle(R.string.menu_select);

    }

}