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

Commit 2886a13d authored by Alex Chau's avatar Alex Chau
Browse files

Clean up test logging and ScreenRecord 

Bug: 194114179
Bug: 193125090
Test: manual
Change-Id: I086d011a39b74a24d5629d43dc74b741fcf5994e
parent 305eaf5e

quickstep/src/com/android/quickstep/util/MotionPauseDetector.java

+1 −13
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package com.android.quickstep.util; 


import android.content.Context;

import android.content.res.Resources;

import android.util.Log;

import android.view.MotionEvent;

import android.view.VelocityTracker;
@@ -86,12 +85,7 @@ public class MotionPauseDetector { 
        mSpeedSomewhatFast = res.getDimension(R.dimen.motion_pause_detector_speed_somewhat_fast);

        mSpeedFast = res.getDimension(R.dimen.motion_pause_detector_speed_fast);

        mForcePauseTimeout = new Alarm();

        mForcePauseTimeout.setOnAlarmListener(alarm -> {

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.MOTION_PAUSE_TIMEOUT, "onAlarm");

            }

            updatePaused(true /* isPaused */);

        });

        mForcePauseTimeout.setOnAlarmListener(alarm -> updatePaused(true /* isPaused */));

        mMakePauseHarderToTrigger = makePauseHarderToTrigger;

        mVelocityProvider = new SystemVelocityProvider(axis);

    }
@@ -128,9 +122,6 @@ public class MotionPauseDetector { 
        long timeoutMs = TestProtocol.sForcePauseTimeout != null

                ? TestProtocol.sForcePauseTimeout

                : mMakePauseHarderToTrigger ? HARDER_TRIGGER_TIMEOUT : FORCE_PAUSE_TIMEOUT;

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.MOTION_PAUSE_TIMEOUT, "setAlarm: " + timeoutMs);

        }

        mForcePauseTimeout.setAlarm(timeoutMs);

        float newVelocity = mVelocityProvider.addMotionEvent(ev, ev.getPointerId(pointerIndex));

        if (mPreviousVelocity != null) {
@@ -172,9 +163,6 @@ public class MotionPauseDetector { 
                }

            }

        }

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.MOTION_PAUSE_TIMEOUT, "checkMotionPaused: " + isPaused);

        }

        updatePaused(isPaused);

    }

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+0 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import com.android.launcher3.tapl.Overview; 
import com.android.launcher3.tapl.OverviewActions;

import com.android.launcher3.tapl.OverviewTask;

import com.android.launcher3.ui.TaplTestsLauncher3;

import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;

import com.android.quickstep.views.RecentsView;
@@ -158,7 +157,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @Test

    @NavigationModeSwitch

    @PortraitLandscape

    @ScreenRecord //b/193125090

    public void testOverviewActions() throws Exception {

        // Experimenting for b/165029151:

        final Overview overview = mLauncher.pressHome().switchToOverview();

src/com/android/launcher3/testing/TestProtocol.java

+0 −1
Original line number Diff line number Diff line
@@ -118,6 +118,5 @@ public final class TestProtocol { 
    public static final String WORK_PROFILE_REMOVED = "b/159671700";

    public static final String FALLBACK_ACTIVITY_NO_SET = "b/181019015";

    public static final String THIRD_PARTY_LAUNCHER_NOT_SET = "b/187080582";

    public static final String MOTION_PAUSE_TIMEOUT = "b/194114179";

    public static final String TASK_VIEW_ID_CRASH = "b/195430732";

}