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

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

Merge "Implementation of Right-click context menus for docs/files." into nyc-andromeda-dev

parents 39c2ac4c ebf2a172

res/menu/activity.xml

+0 −7
Original line number Diff line number Diff line
@@ -57,13 +57,6 @@ 
            android:alphabeticShortcut="e"

            android:showAsAction="never"

            android:visible="false" />

        <item

            android:id="@+id/menu_paste_from_clipboard"

            android:title="@string/menu_paste_from_clipboard"

            android:alphabeticShortcut="v"

            android:showAsAction="never"

            android:visible="false" />

        <!-- Copy action is defined in mode_directory.xml -->

        <item

            android:id="@+id/menu_sort"

            android:title="@string/menu_sort"

res/menu/context_menu.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    <item

        android:id="@+id/menu_cut_to_clipboard"

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

    <item

        android:id="@+id/menu_copy_to_clipboard"

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

    <item

        android:id="@+id/menu_paste_from_clipboard"

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

</menu>

res/menu/mode_directory.xml

+0 −5
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ 
        android:icon="@drawable/ic_menu_delete"

        android:title="@string/menu_delete"

        android:showAsAction="always" />

    <item

        android:id="@+id/menu_copy_to_clipboard"

        android:title="@string/menu_copy_to_clipboard"

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/menu_select_all"

        android:title="@string/menu_select_all"

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 


    <!-- Menu item title that creates a new window in the activity [CHAR LIMIT=24] -->

    <string name="menu_new_window">New window</string>

    <!-- Menu item title that cuts the selected documents to clipboard [CHAR LIMIT=24] -->

    <string name="menu_cut_to_clipboard">Cut</string>

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

    <string name="menu_copy_to_clipboard">Copy</string>

    <!-- Menu item title that pastes files from the clipboard [CHAR LIMIT=24] -->

src/com/android/documentsui/BaseActivity.java

+2 −7
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.view.Menu; 
import android.view.MenuItem;

import android.widget.Spinner;



import com.android.documentsui.MenuManager.DirectoryDetails;

import com.android.documentsui.SearchViewManager.SearchManagerListener;

import com.android.documentsui.State.ViewMode;

import com.android.documentsui.dirlist.AnimationView;
@@ -98,6 +99,7 @@ public abstract class BaseActivity extends Activity 
    public abstract void onDocumentsPicked(List<DocumentInfo> docs);

    public abstract FragmentTuner createFragmentTuner();

    public abstract MenuManager getMenuManager();

    public abstract DirectoryDetails getDirectoryDetails();



    abstract void onTaskFinished(Uri... uris);

    abstract void refreshDirectory(int anim);
@@ -302,13 +304,6 @@ public abstract class BaseActivity extends Activity 
                setViewMode(State.MODE_LIST);

                return true;



            case R.id.menu_paste_from_clipboard:

                DirectoryFragment dir = getDirectoryFragment();

                if (dir != null) {

                    dir.pasteFromClipboard();

                }

                return true;



            case R.id.menu_advanced:

                setDisplayAdvancedDevices(!mState.showAdvanced);

                return true;