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

Commit 92f4104e authored by Jon Mann's avatar Jon Mann Committed by android-build-merger
Browse files

Merge "Implement support for viewing document settings in external applications" into arc-apps 

am: ce97e1f3

Change-Id: I257d515097b811934d3df157848bbee3e4ed8164
parents c9f69a10 ce97e1f3

res/menu/file_context_menu.xml

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

            android:id="@+id/menu_delete"

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

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

    </group>

    </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>
 
</menu>

res/menu/mode_directory.xml

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

        android:title="@string/menu_rename"

        android:showAsAction="never"

        android:showAsAction="never"

        android:visible="false" />

        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>
 
</menu>

res/values/strings.xml

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

    <string name="menu_extract">Extract to\u2026</string>

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

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

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

    <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] -->

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

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

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

src/com/android/documentsui/AbstractActionHandler.java

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

        throw new UnsupportedOperationException("Can't paste into folder.");

    }

    }





    @Override

    public void viewInOwner() {

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

    }



    @Override

    @Override

    public void selectAllFiles() {

    public void selectAllFiles() {

        Metrics.logUserAction(mActivity, Metrics.USER_ACTION_SELECT_ALL);

        Metrics.logUserAction(mActivity, Metrics.USER_ACTION_SELECT_ALL);

src/com/android/documentsui/ActionHandler.java

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




    void loadDocumentsForCurrentStack();

    void loadDocumentsForCurrentStack();





    void viewInOwner();



    /**

    /**

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

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

     * @return this

     * @return this