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 am: 9a76143ef5

Browse Source 
am: 20898f682b

* commit '20898f682b749919c49e8ddb91be40aaa7d2259a':
  Fix regression, show internal storage option...

Change-Id: I3e4a45cb65085a5539cadfdb070e013ae9e1f044
This commit is contained in:
Steve McKay
2016-05-06 15:24:15 +00:00
committed by android-build-merger
parent 114464cc3e 20898f682b
commit 5fa1f50f01
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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_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,20 +214,27 @@ 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.action == ACTION_CREATE ||
state.action == ACTION_OPEN_TREE ||
state.action == ACTION_GET_CONTENT);
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);
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);
}