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

Commit 9515f327 authored by Jon Mann's avatar Jon Mann Committed by android-build-merger
Browse files

Merge "Revert "Implement support for viewing document settings in external... 

Merge "Revert "Implement support for viewing document settings in external applications"" into arc-apps
am: 5a7a0155

Change-Id: I8d08eef49f56fd57165efb88bf0f664f89d8d172
parents 92f4104e 5a7a0155

res/menu/file_context_menu.xml

+0 −6
Original line number Diff line number Diff line
@@ -49,10 +49,4 @@ 
            android:id="@+id/menu_delete"

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

    </group>

    <group

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

        <item

            android:id="@+id/menu_view_in_owner"

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

    </group>

</menu>

res/menu/mode_directory.xml

+0 −5
Original line number Diff line number Diff line
@@ -62,9 +62,4 @@ 
        android:title="@string/menu_rename"

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/menu_view_in_owner"

        android:title="@string/menu_view_in_owner"

        android:showAsAction="never"

        android:visible="false" />

</menu>

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ 
    <string name="menu_extract">Extract to\u2026</string>

    <!-- Menu item that renames the selected document [CHAR LIMIT=28] -->

    <string name="menu_rename">Rename</string>

    <!-- Menu item that renames the selected document [CHAR LIMIT=28] -->

    <string name="menu_view_in_owner">View in <xliff:g id="source" example="Drive">%1$s</xliff:g></string>



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

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

src/com/android/documentsui/AbstractActionHandler.java

+0 −5
Original line number Diff line number Diff line
@@ -225,11 +225,6 @@ public abstract class AbstractActionHandler<T extends Activity & CommonAddons> 
        throw new UnsupportedOperationException("Can't paste into folder.");

    }



    @Override

    public void viewInOwner() {

        throw new UnsupportedOperationException("Can't view in application.");

    }



    @Override

    public void selectAllFiles() {

        Metrics.logUserAction(mActivity, Metrics.USER_ACTION_SELECT_ALL);

src/com/android/documentsui/ActionHandler.java

+0 −2
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ public interface ActionHandler { 


    void loadDocumentsForCurrentStack();



    void viewInOwner();



    /**

     * Allow action handler to be initialized in a new scope.

     * @return this