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

Commit 534e78c2 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Clear separation of RootList Context Menu items and DirList items." into arc-apps

parents ec78861a ff7f3aee

res/menu/mode_directory.xml→res/menu/action_mode_menu.xml

+11 −11
Original line number Diff line number Diff line
@@ -16,54 +16,54 @@ 


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

    <item

        android:id="@+id/menu_open"

        android:id="@+id/action_menu_open"

        android:title="@string/menu_open"

        android:showAsAction="always" />

    <item

        android:id="@+id/menu_open_with"

        android:id="@+id/action_menu_open_with"

        android:title="@string/menu_open_with"

        android:showAsAction="never" />

    <item

        android:id="@+id/menu_share"

        android:id="@+id/action_menu_share"

        android:icon="@drawable/ic_menu_share"

        android:title="@string/menu_share"

        android:showAsAction="always" />

    <item

        android:id="@+id/menu_delete"

        android:id="@+id/action_menu_delete"

        android:icon="@drawable/ic_menu_delete"

        android:title="@string/menu_delete"

        android:showAsAction="always" />

    <item

        android:id="@+id/menu_select_all"

        android:id="@+id/action_menu_select_all"

        android:title="@string/menu_select_all"

        android:showAsAction="never" />

    <item

        android:id="@+id/menu_copy_to"

        android:id="@+id/action_menu_copy_to"

        android:title="@string/menu_copy"

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/menu_extract_to"

        android:id="@+id/action_menu_extract_to"

        android:title="@string/menu_extract"

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/menu_move_to"

        android:id="@+id/action_menu_move_to"

        android:title="@string/menu_move"

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/menu_compress"

        android:id="@+id/action_menu_compress"

        android:title="@string/menu_compress"

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/menu_rename"

        android:id="@+id/action_menu_rename"

        android:title="@string/menu_rename"

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/menu_view_in_owner"

        android:id="@+id/action_menu_view_in_owner"

        android:title="@string/menu_view_in_owner"

        android:showAsAction="never"

        android:visible="false" />

res/menu/activity.xml

+9 −9
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
     setIconified() method

-->

    <item

        android:id="@+id/menu_search"

        android:id="@+id/option_menu_search"

        android:title="@string/menu_search"

        android:icon="@drawable/ic_menu_search"

        android:showAsAction="always"
@@ -34,46 +34,46 @@ 
<!-- This group is being hidden when searching is in full bar mode-->

    <group android:id="@+id/group_hide_when_searching">

        <item

            android:id="@+id/menu_debug"

            android:id="@+id/option_menu_debug"

            android:title="Debug"

            android:icon="@drawable/ic_debug_menu"

            android:visible="false"

            android:showAsAction="always" />

        <item

            android:id="@+id/menu_grid"

            android:id="@+id/option_menu_grid"

            android:title="@string/menu_grid"

            android:icon="@drawable/ic_menu_view_grid"

            android:showAsAction="always" />

        <item

            android:id="@+id/menu_list"

            android:id="@+id/option_menu_list"

            android:title="@string/menu_list"

            android:icon="@drawable/ic_menu_view_list"

            android:showAsAction="always" />

        <item

            android:id="@+id/menu_new_window"

            android:id="@+id/option_menu_new_window"

            android:title="@string/menu_new_window"

            android:alphabeticShortcut="n"

            android:showAsAction="never"

            android:visible="false" />

        <item

            android:id="@+id/menu_create_dir"

            android:id="@+id/option_menu_create_dir"

            android:title="@string/menu_create_dir"

            android:icon="@drawable/ic_menu_new_folder"

            android:alphabeticShortcut="e"

            android:showAsAction="never"

            android:visible="false" />

        <item

            android:id="@+id/menu_select_all"

            android:id="@+id/option_menu_select_all"

            android:title="@string/menu_select_all"

            android:alphabeticShortcut="a"

            android:showAsAction="never"

            android:visible="false" />

        <item

            android:id="@+id/menu_advanced"

            android:id="@+id/option_menu_advanced"

            android:showAsAction="never"

            android:visible="false" />

        <item

            android:id="@+id/menu_settings"

            android:id="@+id/option_menu_settings"

            android:title="@string/menu_settings"

            android:showAsAction="never"

            android:visible="false" />

res/menu/container_context_menu.xml

+3 −3
Original line number Diff line number Diff line
@@ -21,18 +21,18 @@ 
    <group

        android:id="@+id/menu_clipboard_group">

        <item

            android:id="@+id/menu_paste_from_clipboard"

            android:id="@+id/dir_menu_paste_from_clipboard"

            android:title="@string/menu_paste_from_clipboard" />

    </group>



    <group

        android:id="@+id/menu_modifier_group">

        <item

            android:id="@+id/menu_create_dir"

            android:id="@+id/dir_menu_create_dir"

            android:title="@string/menu_create_dir" />



        <item

            android:id="@+id/menu_select_all"

            android:id="@+id/dir_menu_select_all"

            android:title="@string/menu_select_all" />

    </group>

</menu>
 
 No newline at end of file

res/menu/dir_context_menu.xml

+6 −6
Original line number Diff line number Diff line
@@ -21,30 +21,30 @@ 
    <group

        android:id="@+id/menu_open_group">

        <item

            android:id="@+id/menu_open_in_new_window"

            android:id="@+id/dir_menu_open_in_new_window"

            android:title="@string/menu_open_in_new_window" />

    </group>



    <group

        android:id="@+id/menu_clipboard_group">

        <item

            android:id="@+id/menu_cut_to_clipboard"

            android:id="@+id/dir_menu_cut_to_clipboard"

            android:title="@string/menu_cut_to_clipboard" />

        <item

            android:id="@+id/menu_copy_to_clipboard"

            android:id="@+id/dir_menu_copy_to_clipboard"

            android:title="@string/menu_copy_to_clipboard" />

        <item

            android:id="@+id/menu_paste_into_folder"

            android:id="@+id/dir_menu_paste_into_folder"

            android:title="@string/menu_paste_into_folder" />

    </group>



    <group

        android:id="@+id/menu_modifier_group">

        <item

            android:id="@+id/menu_rename"

            android:id="@+id/dir_menu_rename"

            android:title="@string/menu_rename" />

        <item

            android:id="@+id/menu_delete"

            android:id="@+id/dir_menu_delete"

            android:title="@string/menu_delete" />

    </group>

</menu>

res/menu/file_context_menu.xml

+8 −8
Original line number Diff line number Diff line
@@ -20,39 +20,39 @@ 
    <group

        android:id="@+id/menu_open_group">

        <item

            android:id="@+id/menu_share"

            android:id="@+id/dir_menu_share"

            android:title="@string/menu_share" />

        <item

            android:id="@+id/menu_open"

            android:id="@+id/dir_menu_open"

            android:title="@string/menu_open" />

        <item

            android:id="@+id/menu_open_with"

            android:id="@+id/dir_menu_open_with"

            android:title="@string/menu_open_with" />

    </group>



    <group

        android:id="@+id/menu_clipboard_group">

        <item

            android:id="@+id/menu_cut_to_clipboard"

            android:id="@+id/dir_menu_cut_to_clipboard"

            android:title="@string/menu_cut_to_clipboard" />

        <item

            android:id="@+id/menu_copy_to_clipboard"

            android:id="@+id/dir_menu_copy_to_clipboard"

            android:title="@string/menu_copy_to_clipboard" />

    </group>



    <group

        android:id="@+id/menu_modifier_group">

        <item

            android:id="@+id/menu_rename"

            android:id="@+id/dir_menu_rename"

            android:title="@string/menu_rename" />

        <item

            android:id="@+id/menu_delete"

            android:id="@+id/dir_menu_delete"

            android:title="@string/menu_delete" />

    </group>

    <group

        android:id="@+id/menu_settings_group">

        <item

            android:id="@+id/menu_view_in_owner"

            android:id="@+id/dir_menu_view_in_owner"

            android:title="@string/menu_view_in_owner" />

    </group>

</menu>