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

Commit 1c4f13a4 authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Fix regression, show internal storage option..." into nyc-dev 

am: 9a76143ef5

* commit '9a76143ef550a547aefed81acbad5d380cc33393':
  Fix regression, show internal storage option...

Change-Id: Iccbaa87826350a9ac10a0b852dc793bc222f20de
parents 0188e10a 0a2c49a1

src/com/android/documentsui/BaseActivity.java

+14 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.documentsui.State.ACTION_CREATE; 
import static com.android.documentsui.State.ACTION_GET_CONTENT;

import static com.android.documentsui.State.ACTION_OPEN;

import static com.android.documentsui.State.ACTION_OPEN_TREE;

import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;

import static com.android.documentsui.State.MODE_GRID;



import android.app.Activity;
@@ -213,13 +214,15 @@ public abstract class BaseActivity extends Activity 


        includeState(state);



        // Advanced roots are shown by deafult without menu option if forced by config or intent.

        // Advanced roots are shown by default without menu option if forced by config or intent.

        state.showAdvanced = Shared.shouldShowDeviceRoot(this, intent);

        // Menu option is shown for whitelisted intents if advanced roots are not shown by default.

        state.showAdvancedOption = !state.showAdvanced &&

                (state.action == ACTION_OPEN ||

        state.showAdvancedOption = !state.showAdvanced && (

                !directLaunch(intent) ||

                state.action == ACTION_OPEN ||

                state.action == ACTION_CREATE ||

                state.action == ACTION_OPEN_TREE ||

                state.action == ACTION_PICK_COPY_DESTINATION ||

                state.action == ACTION_GET_CONTENT);



        if (DEBUG) Log.d(mTag, "Created new state object: " + state);
@@ -227,6 +230,11 @@ public abstract class BaseActivity extends Activity 
        return state;

    }



    private static boolean directLaunch(Intent intent) {

        return LauncherActivity.isLaunchUri(intent.getData())

                && intent.hasExtra(Shared.EXTRA_STACK);

    }



    public void setRootsDrawerOpen(boolean open) {

        mNavigator.revealRootsDrawer(open);

    }