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

Commit 87f1b2c2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add menu to show properties, add feature flag." into arc-apps

parents 50bf5847 0930d4ca

res/menu/action_mode_menu.xml

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

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/action_menu_inspector"

        android:title="@string/menu_inspector"

        android:showAsAction="never"

        android:visible="false" />

    <item

        android:id="@+id/action_menu_view_in_owner"

        android:title="@string/menu_view_in_owner"

res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
    <bool name="feature_remote_actions">true</bool>

    <bool name="feature_system_keyboard_navigation">true</bool>

    <bool name="feature_virtual_files_sharing">true</bool>

    <bool name="feature_inspector">false</bool>

    <bool name="feature_debug_mode">false</bool>



</resources>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
    <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 displays properties about the selected document [CHAR LIMIT=28] -->

    <string name="menu_inspector">Properties</string>

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

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

src/com/android/documentsui/AbstractActionHandler.java

+4 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.documentsui.LoadDocStackTask.LoadDocStackCallback; 
import com.android.documentsui.base.BooleanConsumer;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.Features;

import com.android.documentsui.base.Lookup;

import com.android.documentsui.base.Providers;

import com.android.documentsui.base.RootInfo;
@@ -231,6 +230,10 @@ public abstract class AbstractActionHandler<T extends Activity & CommonAddons> 
        throw new UnsupportedOperationException("Can't open document.");

    }



    public void showInspector(Selection selection, Context context) {

        throw new UnsupportedOperationException("Can't open properties.");

    }



    @Override

    public void springOpenDirectory(DocumentInfo doc) {

        throw new UnsupportedOperationException("Can't spring open directories.");

src/com/android/documentsui/ActionHandler.java

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.documentsui; 
import android.annotation.IntDef;

import android.app.PendingIntent;

import android.content.ContentProvider;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ResolveInfo;

import android.net.Uri;
@@ -29,6 +30,7 @@ import com.android.documentsui.base.DocumentInfo; 
import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.dirlist.DocumentDetails;

import com.android.documentsui.selection.Selection;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -101,6 +103,8 @@ public interface ActionHandler { 


    void showCreateDirectoryDialog();



    void showInspector(Selection selection, Context context);



    @Nullable DocumentInfo renameDocument(String name, DocumentInfo document);



    /**