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

Commit d12d1ed9 authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Fix local-storage menu item visibility issue."

parents d94862a5 273103b1

packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java

+11 −10
Original line number Diff line number Diff line
@@ -20,15 +20,6 @@ import static com.android.documentsui.DirectoryFragment.ANIM_NONE; 
import static com.android.documentsui.DirectoryFragment.ANIM_SIDE;

import static com.android.documentsui.DirectoryFragment.ANIM_UP;



import java.io.FileNotFoundException;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Collection;

import java.util.HashMap;

import java.util.List;

import java.util.concurrent.Executor;



import libcore.io.IoUtils;

import android.app.Activity;

import android.app.Fragment;

import android.content.Intent;
@@ -61,8 +52,19 @@ import com.android.documentsui.model.DocumentInfo; 
import com.android.documentsui.model.DocumentStack;

import com.android.documentsui.model.DurableUtils;

import com.android.documentsui.model.RootInfo;



import com.google.common.collect.Maps;



import libcore.io.IoUtils;



import java.io.FileNotFoundException;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Collection;

import java.util.HashMap;

import java.util.List;

import java.util.concurrent.Executor;



abstract class BaseActivity extends Activity {



    static final String EXTRA_STATE = "state";
@@ -637,7 +639,6 @@ abstract class BaseActivity extends Activity { 
        private SearchView mView;



        public void install(MenuItem menu) {

            assert(mMenu == null);

            mMenu = menu;

            mView = (SearchView) menu.getActionView();

packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -473,7 +473,8 @@ public class DocumentsActivity extends BaseActivity { 
            createDir.setVisible(false);

        }



        advanced.setVisible(!(mState.action == ACTION_MANAGE || mState.action == ACTION_BROWSE));

        advanced.setVisible(!(mState.action == ACTION_MANAGE || mState.action == ACTION_BROWSE) &&

                !mState.forceAdvanced);

        fileSize.setVisible(fileSizeVisible);



        settings.setVisible((mState.action == ACTION_MANAGE || mState.action == ACTION_BROWSE)

packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java

+11 −6
Original line number Diff line number Diff line
@@ -42,19 +42,19 @@ import android.widget.Spinner; 
import android.widget.Toast;

import android.widget.Toolbar;



import com.android.documentsui.FailureDialogFragment;

import com.android.documentsui.RecentsProvider.ResumeColumns;

import com.android.documentsui.model.DocumentInfo;

import com.android.documentsui.model.DocumentStack;

import com.android.documentsui.model.DurableUtils;

import com.android.documentsui.model.RootInfo;

import com.android.internal.util.Preconditions;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



/**

 * Activity providing a directly launchable file management activity.

 * Standalone file management activity.

 */

public class StandaloneActivity extends BaseActivity {

    public static final String TAG = "StandaloneFileManagement";
@@ -129,11 +129,16 @@ public class StandaloneActivity extends BaseActivity { 
        state.acceptMimes = new String[] { "*/*" };

        state.allowMultiple = true;

        state.acceptMimes = new String[] { intent.getType() };

        state.localOnly = intent.getBooleanExtra(Intent.EXTRA_LOCAL_ONLY, false);

        state.forceAdvanced = intent.getBooleanExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, false);

        state.showAdvanced = state.forceAdvanced

                | LocalPreferences.getDisplayAdvancedDevices(this);



        // These options are specific to the DocumentsActivity.

        Preconditions.checkArgument(

                !intent.hasExtra(Intent.EXTRA_LOCAL_ONLY));

        Preconditions.checkArgument(

                !intent.hasExtra(DocumentsContract.EXTRA_SHOW_ADVANCED));



        state.showAdvanced = LocalPreferences.getDisplayAdvancedDevices(this);

        state.showSize = LocalPreferences.getDisplayFileSize(this);



        final DocumentStack stack = intent.getParcelableExtra(CopyService.EXTRA_STACK);

        if (stack != null)

            state.stack = stack;