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

Commit 4f712933 authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Clean up debug flags and add more screen record am: 261708ba 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15371934

Change-Id: If0293bc29f711703d8def9a48e63becf3c55be0f
parents aa0d6997 261708ba

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ import androidx.test.filters.LargeTest; 
import androidx.test.runner.AndroidJUnit4;



import com.android.launcher3.Launcher;

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

import com.android.quickstep.views.DigitalWellBeingToast;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;
@@ -32,6 +33,7 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest { 
            resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR);



    @Test

    @ScreenRecord //b/193440212

    public void testToast() throws Exception {

        startAppFast(CALCULATOR_PACKAGE);

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

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import com.android.launcher3.testcomponent.TestCommandReceiver; 
import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.Wait;

import com.android.launcher3.util.rule.FailureWatcher;

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

import com.android.quickstep.views.RecentsView;



import org.junit.After;
@@ -213,6 +214,7 @@ public class FallbackRecentsTest { 
    // b/143488140

    //@NavigationModeSwitch

    @Test

    @ScreenRecord // b/194484556

    public void testOverview() {

        startAppFast(getAppPackageName());

        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

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

+1 −5
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 


    @Test

    @PortraitLandscape

    @ScreenRecord //b/191344757

    @ScreenRecord //b/193440212

    public void testOverview() throws Exception {

        startTestAppsWithCheck();

        // mLauncher.pressHome() also tests an important case of pressing home while in background.
@@ -159,7 +159,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @Test

    @NavigationModeSwitch

    @PortraitLandscape

    @ScreenRecord //b/191344757

    public void testOverviewActions() throws Exception {

        // Experimenting for b/165029151:

        final Overview overview = mLauncher.pressHome().switchToOverview();
@@ -185,7 +184,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @Test

    @NavigationModeSwitch

    @PortraitLandscape

    @ScreenRecord //b/191344757

    public void testSwitchToOverview() throws Exception {

        assertNotNull("Workspace.switchToOverview() returned null",

                mLauncher.pressHome().switchToOverview());
@@ -196,7 +194,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @Test

    @NavigationModeSwitch

    @PortraitLandscape

    @ScreenRecord //b/191344757

    public void testBackground() throws Exception {

        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

        final Background background = getAndAssertBackground();
@@ -218,7 +215,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 


    @Test

    @PortraitLandscape

    @ScreenRecord //b/191344757

    public void testAllAppsFromHome() throws Exception {

        // Test opening all apps

        assertNotNull("switchToAllApps() returned null",

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

+1 −4
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ package com.android.launcher3.touch; 


import static android.view.MotionEvent.INVALID_POINTER_ID;



import static com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS;



import android.graphics.PointF;

import android.util.Log;

import android.view.MotionEvent;
@@ -43,8 +41,7 @@ import java.util.Queue; 
 */

public abstract class BaseSwipeDetector {



    // b/193440212: Debug swipe gesture in tests.

    private static final boolean DBG = IS_RUNNING_IN_TEST_HARNESS;

    private static final boolean DBG = false;

    private static final String TAG = "BaseSwipeDetector";

    private static final float ANIMATION_DURATION = 1200;

    /** The minimum release velocity in pixels per millisecond that triggers fling.*/