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

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

Merge "Step 4 from the plan below:" into ub-launcher3-master

parents c78308a9 ad81b816

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

+10 −4
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName; 
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.rule.ShellCommandRule.disableHeadsUpNotification;

import static com.android.launcher3.util.rule.ShellCommandRule.getLauncherCommand;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_PRESUBMIT;

import static com.android.launcher3.util.rule.TestStabilityRule.RUN_FLAFOR;

import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_PRESUBMIT;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;
@@ -131,7 +134,8 @@ public class FallbackRecentsTest { 
    @Test

    public void goToOverviewFromHome() {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&

                (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {

            return;

        }

        mDevice.pressHome();
@@ -145,7 +149,8 @@ public class FallbackRecentsTest { 
    @Test

    public void goToOverviewFromApp() {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&

                (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {

            return;

        }

        startAppFastAndWaitForRecentTask(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
@@ -183,7 +188,8 @@ public class FallbackRecentsTest { 
    @Test

    public void testOverview() {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&

                (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {

            return;

        }

        startAppFastAndWaitForRecentTask(getAppPackageName());

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

+5 −1
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ package com.android.quickstep; 


import static com.android.launcher3.util.RaceConditionReproducer.enterEvt;

import static com.android.launcher3.util.RaceConditionReproducer.exitEvt;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_PRESUBMIT;

import static com.android.launcher3.util.rule.TestStabilityRule.RUN_FLAFOR;

import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_PRESUBMIT;



import android.content.Intent;
@@ -93,7 +96,8 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { 
    @NavigationModeSwitch

    public void testStressSwipeToOverview() {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&

                (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {

            return;

        }

        for (int i = 0; i < STRESS_REPEAT_COUNT; ++i) {

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+6 −1
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ package com.android.launcher3.ui; 


import static androidx.test.InstrumentationRegistry.getInstrumentation;



import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_PRESUBMIT;

import static com.android.launcher3.util.rule.TestStabilityRule.RUN_FLAFOR;

import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_PRESUBMIT;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;
@@ -174,7 +178,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    @Test

    public void testWorkspace() throws Exception {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&

                (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {

            return;

        }

        final Workspace workspace = mLauncher.getWorkspace();

tests/src/com/android/launcher3/util/rule/TestStabilityRule.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class TestStabilityRule implements TestRule { 
    public static final int PLATFORM_PRESUBMIT = 0x8;

    public static final int PLATFORM_POSTSUBMIT = 0x10;



    private static final int RUN_FLAFOR = getRunFlavor();

    public static final int RUN_FLAFOR = getRunFlavor();



    @Retention(RetentionPolicy.RUNTIME)

    @Target(ElementType.METHOD)