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

Commit b52eb8b5 authored by Jon Mann's avatar Jon Mann Committed by Android (Google) Code Review
Browse files

Merge "Add 'Select All' option to menu." into arc-apps

parents 53aaa899 49be24c9

res/menu/activity.xml

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ 
            android:icon="@drawable/ic_menu_view_list"

            android:showAsAction="always" />



        <item

            android:id="@+id/menu_select_all"

            android:title="@string/menu_select_all"

            android:alphabeticShortcut="a"

            android:showAsAction="never"

            android:visible="false" />

        <item

            android:id="@+id/menu_new_window"

            android:title="@string/menu_new_window"

src/com/android/documentsui/BaseActivity.java

+7 −0
Original line number Diff line number Diff line
@@ -336,6 +336,13 @@ public abstract class BaseActivity 
                setDisplayAdvancedDevices(!mState.showAdvanced);

                return true;



            case R.id.menu_select_all:

                DirectoryFragment dir = getDirectoryFragment();

                if (dir != null) {

                    dir.selectAllFiles();

                }

                return true;



            default:

                return super.onOptionsItemSelected(item);

        }

src/com/android/documentsui/MenuManager.java

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ public abstract class MenuManager { 
    public void updateOptionMenu(Menu menu) {

        updateCreateDir(menu.findItem(R.id.menu_create_dir));

        updateSettings(menu.findItem(R.id.menu_settings));

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

        updateNewWindow(menu.findItem(R.id.menu_new_window));

        updateModePicker(menu.findItem(R.id.menu_grid), menu.findItem(R.id.menu_list));

        // Sort menu item is managed by SortMenuManager

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

+8 −1
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ public class FilesActivity extends BaseActivity implements ActionHandler.Addons 


    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        DirectoryFragment dir;

        switch (item.getItemId()) {

            case R.id.menu_create_dir:

                assert(canCreateDirectory());
@@ -236,7 +237,7 @@ public class FilesActivity extends BaseActivity implements ActionHandler.Addons 
                mInjector.actions.openInNewWindow(mState.stack);

                break;

            case R.id.menu_paste_from_clipboard:

                DirectoryFragment dir = getDirectoryFragment();

                dir = getDirectoryFragment();

                if (dir != null) {

                    dir.pasteFromClipboard();

                }
@@ -244,6 +245,12 @@ public class FilesActivity extends BaseActivity implements ActionHandler.Addons 
            case R.id.menu_settings:

                mInjector.actions.openSettings(getCurrentRoot());

                break;

            case R.id.menu_select_all:

                dir = getDirectoryFragment();

                if (dir != null) {

                    dir.selectAllFiles();

                }

                break;

            default:

                return super.onOptionsItemSelected(item);

        }