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

Commit 9506316e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "More logging for pause non-detection" into ub-launcher3-rvc-dev

parents 4f517257 ad87034d

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_O 
import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.util.Log;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewConfiguration;
@@ -47,6 +48,7 @@ import com.android.launcher3.anim.AnimationSuccessListener; 
import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.VibratorWrapper;
@@ -178,6 +180,9 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 


    @Override

    public boolean onDrag(float displacement, MotionEvent event) {

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "FlingAndHoldTouchController");

        }

        float upDisplacement = -displacement;

        mMotionPauseDetector.setDisallowPause(!handlingOverviewAnim()

                || upDisplacement < mMotionPauseMinDisplacement

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC; 
import android.animation.AnimatorSet;

import android.animation.ValueAnimator;

import android.graphics.PointF;

import android.util.Log;

import android.view.MotionEvent;



import com.android.launcher3.Launcher;
@@ -35,6 +36,7 @@ import com.android.launcher3.LauncherStateManager; 
import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.VibratorWrapper;

import com.android.quickstep.util.StaggeredWorkspaceAnim;
@@ -146,6 +148,9 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 


    @Override

    public boolean onDrag(float yDisplacement, float xDisplacement, MotionEvent event) {

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "NoButtonNavbarToOverviewTouchController");

        }

        if (mMotionPauseDetector.isPaused()) {

            if (!mReachedOverview) {

                mStartDisplacement.set(xDisplacement, yDisplacement);

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.quickstep.inputconsumers; 
import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;



import android.util.Log;

import android.view.KeyEvent;

import android.view.MotionEvent;
@@ -95,6 +96,9 @@ public class OverviewInputConsumer<T extends BaseDraggingActivity> 
            ev.setEdgeFlags(flags | Utilities.EDGE_NAV_BAR);

        }

        ev.offsetLocation(-mLocationOnScreen[0], -mLocationOnScreen[1]);

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "OverviewInputConsumer");

        }

        boolean handled = mEventReceiver.test(ev);

        ev.offsetLocation(mLocationOnScreen[0], mLocationOnScreen[1]);

        ev.setEdgeFlags(flags);

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

+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ public abstract class AbstractStateChangeTouchController 


    @Override

    public final boolean onControllerTouchEvent(MotionEvent ev) {

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "onControllerTouchEvent");

        }

        return mDetector.onTouchEvent(ev);

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.view.ViewConfiguration; 
import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;



import com.android.launcher3.testing.TestProtocol;



import java.util.LinkedList;

import java.util.Queue;
@@ -173,6 +175,9 @@ public abstract class BaseSwipeDetector { 
                if (mState != ScrollState.DRAGGING && shouldScrollStart(mDisplacement)) {

                    setState(ScrollState.DRAGGING);

                }

                if (TestProtocol.sDebugTracing) {

                    Log.d(TestProtocol.PAUSE_NOT_DETECTED, "before report dragging");

                }

                if (mState == ScrollState.DRAGGING) {

                    reportDragging(ev);

                }