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

Commit 9e66bd42 authored Aug 24, 2023 by Brian Isganitis Committed by Automerger Merge Worker Aug 24, 2023

Merge "Introduce TAPL APIs for Taskbar QSB and search results." into udc-qpr-dev am: fa905e43

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

Change-Id: Ie7faa7c709bf99cffd8694d065b0bb8b126ab34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a131aedb fa905e43

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -336,4 +336,11 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer {
		final Bundle testInfo = mLauncher.getTestInfo(TestProtocol.REQUEST_APP_LIST_FREEZE_FLAGS);
		return testInfo == null ? 0 : testInfo.getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
		}

		/**
		* Return the QSB UI object on the AllApps screen.
		* @return the QSB UI object.
		*/
		@NonNull
		public abstract Qsb getQsb();
		}
		No newline at end of file

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -62,4 +62,10 @@ public class AllAppsFromTaskbar extends AllApps {
		return mLauncher.getTestInfo(TestProtocol.REQUEST_TASKBAR_APPS_LIST_SCROLL_Y)
		.getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
		}

		@NonNull
		@Override
		public TaskbarAllAppsQsb getQsb() {
		return new TaskbarAllAppsQsb(mLauncher, verifyActiveContainer());
		}
		}

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

+1 −10

Original line number	Diff line number	Diff line
		@@ -22,16 +22,7 @@ import androidx.test.uiautomator.UiObject2;
		*/
		class AllAppsQsb extends Qsb {

		private final UiObject2 mAllAppsContainer;

		AllAppsQsb(LauncherInstrumentation launcher, UiObject2 allAppsContainer) {
		super(launcher);
		mAllAppsContainer = allAppsContainer;
		waitForQsbObject();
		}

		@Override
		protected UiObject2 waitForQsbObject() {
		return mLauncher.waitForObjectInContainer(mAllAppsContainer, "search_container_all_apps");
		super(launcher, allAppsContainer, "search_container_all_apps");
		}
		}

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -117,11 +117,8 @@ public class HomeAllApps extends AllApps {
		}
		}

		/**
		* Return the QSB UI object on the AllApps screen.
		* @return the QSB UI object.
		*/
		@NonNull
		@Override
		public Qsb getQsb() {
		return new AllAppsQsb(mLauncher, verifyActiveContainer());
		}

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

+1 −10

Original line number	Diff line number	Diff line
		@@ -22,16 +22,7 @@ import androidx.test.uiautomator.UiObject2;
		*/
		class HomeQsb extends Qsb {

		private final UiObject2 mHotSeat;

		HomeQsb(LauncherInstrumentation launcher, UiObject2 hotseat) {
		super(launcher);
		mHotSeat = hotseat;
		waitForQsbObject();
		}

		@Override
		protected UiObject2 waitForQsbObject() {
		return mLauncher.waitForObjectInContainer(mHotSeat, "search_container_hotseat");
		super(launcher, hotseat, "search_container_hotseat");
		}
		}