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

Commit 82e05f09 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-46bf7ca6-57e7-44b8-8edc-ea8830c1cb3b-for-git_oc-mr1-release-40... 

release-request-46bf7ca6-57e7-44b8-8edc-ea8830c1cb3b-for-git_oc-mr1-release-4090244 snap-temp-L07700000073092334

Change-Id: Ib8e935eccc2b4104c903451d64f2ff18621569f7
parents 810174c6 cf06c816

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
        </activity>



        <activity

            android:enabled="false"

            android:enabled="@bool/feature_inspector"

            android:name=".inspector.DocumentInspectorActivity"

            android:label="Properties"

            android:icon="@drawable/launcher_icon"

src/com/android/documentsui/AbstractActionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ public abstract class AbstractActionHandler<T extends Activity & CommonAddons> 
        throw new UnsupportedOperationException("Can't open document.");

    }



    public void showInspector(Selection selection, Context context) {

    public void showInspector(DocumentInfo doc) {

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

    }

src/com/android/documentsui/ActionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public interface ActionHandler { 


    void showCreateDirectoryDialog();



    void showInspector(Selection selection, Context context);

    void showInspector(DocumentInfo doc);



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

src/com/android/documentsui/files/ShortcutsUpdater.java→src/com/android/documentsui/ShortcutsUpdater.java

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.documentsui.files;

package com.android.documentsui;



import android.annotation.DrawableRes;

import android.content.Context;
@@ -25,6 +25,7 @@ import android.graphics.drawable.Icon; 
import com.android.documentsui.R;

import com.android.documentsui.base.Providers;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.prefs.ScopedPreferences;



import java.util.ArrayList;

src/com/android/documentsui/dirlist/DirectoryFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -671,7 +671,9 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On 


            case R.id.action_menu_inspector:

                mActionModeController.finishActionMode();

                mActions.showInspector(selection, getContext());

                assert(selection.size() == 1);

                DocumentInfo doc = mModel.getDocuments(selection).get(0);

                mActions.showInspector(doc);

                return true;



            case R.id.dir_menu_cut_to_clipboard: