Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Steve McKay
2016-05-06 15:07:48 +00:00
committed by Android (Google) Code Review
parent b8dd0c3786 5acf1ac2ab
commit 9a76143ef5
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
View File

@@ -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_GET_CONTENT;
import static com.android.documentsui.State.ACTION_OPEN; import static com.android.documentsui.State.ACTION_OPEN;
import static com.android.documentsui.State.ACTION_OPEN_TREE; 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 static com.android.documentsui.State.MODE_GRID;
import android.app.Activity; import android.app.Activity;
@@ -213,13 +214,15 @@ public abstract class BaseActivity extends Activity
includeState(state); 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); state.showAdvanced = Shared.shouldShowDeviceRoot(this, intent);
// Menu option is shown for whitelisted intents if advanced roots are not shown by default. // Menu option is shown for whitelisted intents if advanced roots are not shown by default.
state.showAdvancedOption = !state.showAdvanced && state.showAdvancedOption = !state.showAdvanced && (
(state.action == ACTION_OPEN || !directLaunch(intent) ||
state.action == ACTION_OPEN ||
state.action == ACTION_CREATE || state.action == ACTION_CREATE ||
state.action == ACTION_OPEN_TREE || state.action == ACTION_OPEN_TREE ||
state.action == ACTION_PICK_COPY_DESTINATION ||
state.action == ACTION_GET_CONTENT); state.action == ACTION_GET_CONTENT);
if (DEBUG) Log.d(mTag, "Created new state object: " + state); if (DEBUG) Log.d(mTag, "Created new state object: " + state);
@@ -227,6 +230,11 @@ public abstract class BaseActivity extends Activity
return state; return state;
} }
private static boolean directLaunch(Intent intent) {
return LauncherActivity.isLaunchUri(intent.getData())
&& intent.hasExtra(Shared.EXTRA_STACK);
}
public void setRootsDrawerOpen(boolean open) { public void setRootsDrawerOpen(boolean open) {
mNavigator.revealRootsDrawer(open); mNavigator.revealRootsDrawer(open);
} }