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

Commit 73e96005 authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Don\'t apply fancy back logic when drawer is not present." into nyc-dev 

am: 40d5d9d8

* commit '40d5d9d8':
  Don't apply fancy back logic when drawer is not present.
parents f1fa5594 40d5d9d8

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -539,7 +539,8 @@ public abstract class BaseActivity extends Activity 
        // Do some "do what a I want" drawer fiddling, but don't

        // Do some "do what a I want" drawer fiddling, but don't

        // do it if user already hit back recently and we recently

        // do it if user already hit back recently and we recently

        // did some fiddling.

        // did some fiddling.

        if ((System.currentTimeMillis() - mDrawerLastFiddled) > DRAWER_NO_FIDDLE_DELAY) {

        if (mDrawer.isPresent()

                && (System.currentTimeMillis() - mDrawerLastFiddled) > DRAWER_NO_FIDDLE_DELAY) {

            // Close drawer if it is open.

            // Close drawer if it is open.

            if (mDrawer.isOpen()) {

            if (mDrawer.isOpen()) {

                mDrawer.setOpen(false);

                mDrawer.setOpen(false);

packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java

+7 −17
Original line number Original line Diff line number Diff line
@@ -16,35 +16,18 @@ 




package com.android.documentsui;

package com.android.documentsui;





import static com.android.documentsui.StubProvider.DEFAULT_AUTHORITY;

import static com.android.documentsui.StubProvider.ROOT_0_ID;

import static com.android.documentsui.StubProvider.ROOT_0_ID;





import android.app.Instrumentation;

import android.content.ContentProviderClient;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.os.RemoteException;

import android.os.RemoteException;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.Configurator;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.Until;

import android.support.test.uiautomator.Until;

import android.test.ActivityInstrumentationTestCase2;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.LargeTest;

import android.util.Log;

import android.view.MotionEvent;



import com.android.documentsui.model.RootInfo;





@LargeTest

@LargeTest

public class DownloadsActivityUiTest extends ActivityTest<DownloadsActivity> {

public class DownloadsActivityUiTest extends ActivityTest<DownloadsActivity> {





    private static final int TIMEOUT = 5000;

    private static final String TAG = "DownloadsActivityUiTest";

    private static final String TARGET_PKG = "com.android.documentsui";

    private static final String LAUNCHER_PKG = "com.android.launcher";



    public DownloadsActivityUiTest() {

    public DownloadsActivityUiTest() {

        super(DownloadsActivity.class);

        super(DownloadsActivity.class);

    }

    }
@@ -108,4 +91,11 @@ public class DownloadsActivityUiTest extends ActivityTest<DownloadsActivity> { 
        device.waitForIdle();

        device.waitForIdle();

        assertNotNull(bot.menuShare());

        assertNotNull(bot.menuShare());

    }

    }



    public void testClosesOnBack() throws Exception {

        DownloadsActivity activity = getActivity();

        device.pressBack();

        device.wait(Until.gone(By.text(ROOT_0_ID)), TIMEOUT);  // wait for the window to go away

        assertTrue(activity.isDestroyed());

    }

}
 
}

packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java

+0 −19
Original line number Original line Diff line number Diff line
@@ -16,34 +16,15 @@ 




package com.android.documentsui;

package com.android.documentsui;





import static com.android.documentsui.StubProvider.DEFAULT_AUTHORITY;

import static com.android.documentsui.StubProvider.ROOT_0_ID;

import static com.android.documentsui.StubProvider.ROOT_0_ID;

import static com.android.documentsui.StubProvider.ROOT_1_ID;

import static com.android.documentsui.StubProvider.ROOT_1_ID;





import android.app.Instrumentation;

import android.content.ContentProviderClient;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.os.RemoteException;

import android.os.RemoteException;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.Configurator;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.Until;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.LargeTest;

import android.util.Log;

import android.view.MotionEvent;



import com.android.documentsui.model.RootInfo;





@LargeTest

@LargeTest

public class FilesActivityUiTest extends ActivityTest<FilesActivity> {

public class FilesActivityUiTest extends ActivityTest<FilesActivity> {





    private static final int TIMEOUT = 5000;

    private static final String TAG = "FilesActivityUiTest";

    private static final String TARGET_PKG = "com.android.documentsui";

    private static final String LAUNCHER_PKG = "com.android.launcher";



    public FilesActivityUiTest() {

    public FilesActivityUiTest() {

        super(FilesActivity.class);

        super(FilesActivity.class);

    }

    }

packages/DocumentsUI/tests/src/com/android/documentsui/RenameDocumentUiTest.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -18,9 +18,6 @@ package com.android.documentsui; 




import static com.android.documentsui.StubProvider.ROOT_0_ID;

import static com.android.documentsui.StubProvider.ROOT_0_ID;





import android.support.test.uiautomator.UiObject;

import android.support.test.uiautomator.UiObjectNotFoundException;

import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.LargeTest;





@LargeTest

@LargeTest

packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.documentsui; 
import static com.android.documentsui.StubProvider.ROOT_0_ID;

import static com.android.documentsui.StubProvider.ROOT_0_ID;

import static com.android.documentsui.StubProvider.ROOT_1_ID;

import static com.android.documentsui.StubProvider.ROOT_1_ID;





import android.support.test.uiautomator.UiObject;

import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.LargeTest;





@LargeTest

@LargeTest