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

Commit 2349efe5 authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add logs for workspace long press"" into main

parents b265cf8f fd66d09e

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.launcher3.testing;



import static com.android.launcher3.testing.shared.TestProtocol.WORKSPACE_LONG_PRESS;

import static com.android.launcher3.testing.shared.TestProtocol.testLogD;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
@@ -137,12 +135,10 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
            }



            case TestProtocol.REQUEST_ENABLE_DEBUG_TRACING:

                testLogD(WORKSPACE_LONG_PRESS, "enablingDebugTracing");

                TestProtocol.sDebugTracing = true;

                return response;



            case TestProtocol.REQUEST_DISABLE_DEBUG_TRACING:

                testLogD(WORKSPACE_LONG_PRESS, "disablingDebugTracing");

                TestProtocol.sDebugTracing = false;

                return response;

src/com/android/launcher3/touch/WorkspaceTouchListener.java

+0 −11
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ import static com.android.launcher3.LauncherState.ALL_APPS; 
import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_CLOSE_TAP_OUTSIDE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORKSPACE_LONGPRESS;

import static com.android.launcher3.testing.shared.TestProtocol.WORKSPACE_LONG_PRESS;



import android.graphics.PointF;

import android.graphics.Rect;

import android.util.Log;

import android.view.GestureDetector;

import android.view.HapticFeedbackConstants;

import android.view.MotionEvent;
@@ -41,7 +39,6 @@ import com.android.launcher3.AbstractFloatingView; 
import com.android.launcher3.CellLayout;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.Utilities;

import com.android.launcher3.Workspace;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.dragndrop.DragLayer;
@@ -112,10 +109,6 @@ public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListe 
                mTouchDownPoint.set(ev.getX(), ev.getY());

                // Mouse right button's ACTION_DOWN should immediately show menu

                if (TouchUtil.isMouseRightClickDownOrMove(ev)) {

                    if (Utilities.isRunningInTestHarness()) {

                        Log.d(WORKSPACE_LONG_PRESS, "longPress from mouseHandling timeout: +"

                                + ViewConfiguration.getLongPressTimeout());

                    }

                    maybeShowMenu();

                    return true;

                }
@@ -199,10 +192,6 @@ public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListe 


    @Override

    public void onLongPress(MotionEvent event) {

        if (Utilities.isRunningInTestHarness()) {

            Log.d(WORKSPACE_LONG_PRESS, "longPress from gestureHandler timeout: " +

                    ViewConfiguration.getLongPressTimeout());

        }

        maybeShowMenu();

    }