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

Commit 4a708997 authored by Sebastián Franco's avatar Sebastián Franco Committed by Android (Google) Code Review
Browse files

Merge "Moving the static initialization method from TaplTestsLauncher3 to... 

Merge "Moving the static initialization method from TaplTestsLauncher3 to AbstractLauncherUiTest" into main
parents d3087e3c 0e02d74c

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

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.Intent; 
import com.android.launcher3.tapl.LauncherInstrumentation;

import com.android.launcher3.tapl.Taskbar;

import com.android.launcher3.ui.AbstractLauncherUiTest;

import com.android.launcher3.ui.TaplTestsLauncher3;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.LauncherLayoutBuilder;

import com.android.launcher3.util.TestUtil;
@@ -55,7 +54,7 @@ public class AbstractTaplTestsTaskbar extends AbstractQuickStepTest { 
                "com.google.android.apps.nexuslauncher.tests",

                "com.android.launcher3.testcomponent.BaseTestingActivity");

        mLauncherLayout = TestUtil.setLauncherDefaultLayout(mTargetContext, layoutBuilder);

        TaplTestsLauncher3.initialize(this);

        AbstractLauncherUiTest.initialize(this);

        startAppFast(CALCULATOR_APP_PACKAGE);

        mLauncher.enableBlockTimeout(true);

        mLauncher.showTaskbarIfHidden();

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUB 
import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.launcher3.ui.TaplTestsLauncher3;

import com.android.launcher3.ui.AbstractLauncherUiTest;

import com.android.launcher3.util.rule.TestStabilityRule.Stability;

import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
@@ -40,7 +40,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { 
    @Before

    public void setUp() throws Exception {

        super.setUp();

        TaplTestsLauncher3.initialize(this);

        AbstractLauncherUiTest.initialize(this);

        // b/143488140

        mLauncher.goHome();

        // Start an activity where the gestures start.

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

package com.android.quickstep;



import static com.android.launcher3.ui.TaplTestsLauncher3.initialize;

import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize;

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

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

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

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



import com.android.launcher3.tapl.KeyboardQuickSwitch;

import com.android.launcher3.ui.TaplTestsLauncher3;

import com.android.launcher3.ui.AbstractLauncherUiTest;



import org.junit.Assume;

import org.junit.Test;
@@ -56,7 +56,7 @@ public class TaplTestsKeyboardQuickSwitch extends AbstractQuickStepTest { 
    public void setUp() throws Exception {

        Assume.assumeTrue(mLauncher.isTablet());

        super.setUp();

        TaplTestsLauncher3.initialize(this);

        AbstractLauncherUiTest.initialize(this);

        startAppFast(CALCULATOR_APP_PACKAGE);

        startTestActivity(2);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel; 
import com.android.launcher3.tapl.Overview;

import com.android.launcher3.tapl.OverviewActions;

import com.android.launcher3.tapl.OverviewTask;

import com.android.launcher3.ui.AbstractLauncherUiTest;

import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape;

import com.android.launcher3.ui.TaplTestsLauncher3;

import com.android.launcher3.util.Wait;

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

import com.android.launcher3.util.rule.TestStabilityRule;
@@ -72,7 +72,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @Before

    public void setUp() throws Exception {

        super.setUp();

        TaplTestsLauncher3.initialize(this);

        AbstractLauncherUiTest.initialize(this);

        executeOnLauncher(launcher -> {

            RecentsView recentsView = launcher.getOverviewPanel();

            recentsView.getPagedViewOrientedState().forceAllowRotationForTesting(true);