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

Commit c2842d8f authored by vadimt's avatar vadimt
Browse files

Enabling testPressHomeOnAllAppsContextMenu while fixing failure cause 

Change-Id: I012d5144651f5e7fb362caaef6eec8cee7622fb4
parent a7c931dd

src/com/android/launcher3/popup/PopupContainerWithArrow.java

+4 −0
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr 


    @Override

    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {

        if (ev.getY() > (mLauncher.getDragLayer().getHeight()

                - mLauncher.getDeviceProfile().getInsets().bottom)) {

            return false;

        }

        if (ev.getAction() == MotionEvent.ACTION_DOWN) {

            BaseDragLayer dl = getPopupContainer();

            if (!dl.isEventOverView(this, ev)) {

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+0 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import com.android.launcher3.widget.WidgetsRecyclerView; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -122,7 +121,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    }



    @Test

    @Ignore

    public void testPressHomeOnAllAppsContextMenu() throws Exception {

        final AllApps allApps = mLauncher.getWorkspace().switchToAllApps();

        allApps.freeze();

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+1 −3
Original line number Diff line number Diff line
@@ -663,9 +663,7 @@ public final class LauncherInstrumentation { 
                    mDevice.waitForIdle();



                    if (getNavigationModel() == NavigationModel.TWO_BUTTON) {

                        if (hasLauncherObject(CONTEXT_MENU_RES_ID) ||

                                hasLauncherObject(WIDGETS_RES_ID)

                                        && !mDevice.isNaturalOrientation()) {

                        if (hasLauncherObject(WIDGETS_RES_ID) && !mDevice.isNaturalOrientation()) {

                            expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_PILFER_POINTERS);

                        }

                    }