Merge "Revert "Enabling testPressHomeOnAllAppsContextMenu while fixing failure cause"" into ub-launcher3-master

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

@@ -169,10 +169,6 @@ 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

@@ -42,6 +42,7 @@ 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;
 
@@ -121,6 +122,7 @@ 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

@@ -663,7 +663,9 @@ public final class LauncherInstrumentation {
                     mDevice.waitForIdle();
 
                     if (getNavigationModel() == NavigationModel.TWO_BUTTON) {
-                        if (hasLauncherObject(WIDGETS_RES_ID) && !mDevice.isNaturalOrientation()) {
+                        if (hasLauncherObject(CONTEXT_MENU_RES_ID) ||
+                                hasLauncherObject(WIDGETS_RES_ID)
+                                        && !mDevice.isNaturalOrientation()) {
                             expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_PILFER_POINTERS);
                         }
                     }