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

Commit 93f8778d authored by Pat Manning's avatar Pat Manning Committed by Android (Google) Code Review
Browse files

Merge "Go home before getting overview in test to ensure overview will exist." into main

parents 7275322c 3a2fde4d

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class TaplOverviewIconTest extends AbstractLauncherUiTest { 
        taskMenu.touchOutsideTaskMenuToDismiss();



        OverviewTaskMenu splitMenu =

                mLauncher.getOverview().getCurrentTask().tapSplitTaskMenu();

                mLauncher.goHome().switchToOverview().getCurrentTask().tapSplitTaskMenu();

        assertTrue("App info item not appearing in expanded split task's menu.",

                splitMenu.hasMenuItem("App info"));

        splitMenu.touchOutsideTaskMenuToDismiss();

tests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java

+2 −10
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.launcher3.tapl;



import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;



import androidx.annotation.NonNull;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiObject2;
@@ -61,14 +59,8 @@ public class OverviewTaskMenu { 
        try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();

             LauncherInstrumentation.Closable c = mLauncher.addContextLayer(

                     "before tapping the app info menu item")) {



            mLauncher.executeAndWaitForLauncherEvent(

                    () -> mLauncher.clickLauncherObject(

                            mLauncher.findObjectInContainer(mMenu, By.text("App info"))),

                    accessibilityEvent ->

                            accessibilityEvent.getEventType() == TYPE_WINDOW_STATE_CHANGED,

                    () -> "Unable to start Settings by clicking App Info",

                    "Tap the app info menu item");

            mLauncher.clickLauncherObject(

                    mLauncher.findObjectInContainer(mMenu, By.text("App info")));



            try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(

                    "tapped app info menu item")) {