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

Commit a11d0247 authored by Felipe Leme's avatar Felipe Leme
Browse files

DO NOT MERGE ANYWHERE 

(cherrpy pick of commit cc8fcf2efd66afdaa900b4d27e1eb784e8d40752).

Don't open drawer when back is pressed after being launched externally.

Change-Id: I3e8afd68c33b519dd5d6b27e3fa94653c2537612
Fixes: 30743235
parent 8aacc3cf

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

+7 −2
Original line number Diff line number Diff line
@@ -401,8 +401,13 @@ public class FilesActivity extends BaseActivity { 
                return true;

            }



            // Open the Close drawer if it is closed and we're at the top of a root.

            if (size <= 1) {

            final Intent intent = getIntent();

            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);

                // Remember so we don't just close it again if back is pressed again.

                mDrawerLastFiddled = System.currentTimeMillis();