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

Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-20 03:25:34 +00:00
committed by Android (Google) Code Review
parent d4f39096dd a11d02477e
commit 1ae521df6a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
View File

@@ -401,8 +401,13 @@ public class FilesActivity extends BaseActivity {
return true; return true;
} }
// Open the Close drawer if it is closed and we're at the top of a root. final Intent intent = getIntent();
if (size <= 1) { final boolean launchedExternally = intent != null && intent.getData() != null
&& mState.action == State.ACTION_BROWSE;
// Open the Close drawer if it is closed and we're at the top of a root, but only when
// not launched by another app.
if (size <= 1 && !launchedExternally) {
mDrawer.setOpen(true); mDrawer.setOpen(true);
// Remember so we don't just close it again if back is pressed again. // Remember so we don't just close it again if back is pressed again.
mDrawerLastFiddled = System.currentTimeMillis(); mDrawerLastFiddled = System.currentTimeMillis();