Improving TAPL code around fallback recents (c0a1b704) · Commits · e / os / android_packages_apps_Trebuchet

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,8 @@ public class Background extends LauncherInstrumentation.VisibleContainer {
		"want to switch from background to overview")) {
		verifyActiveContainer();
		goToOverviewUnchecked(BACKGROUND_APP_STATE_ORDINAL);
		return new BaseOverview(mLauncher);
		return mLauncher.isFallbackOverview() ?
		new BaseOverview(mLauncher) : new Overview(mLauncher);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {

		@Override
		protected LauncherInstrumentation.ContainerType getContainerType() {
		return LauncherInstrumentation.ContainerType.BASE_OVERVIEW;
		return LauncherInstrumentation.ContainerType.FALLBACK_OVERVIEW;
		}

		/**

+6 −2

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ public final class LauncherInstrumentation {
		// Types for launcher containers that the user is interacting with. "Background" is a
		// pseudo-container corresponding to inactive launcher covered by another app.
		enum ContainerType {
		WORKSPACE, ALL_APPS, OVERVIEW, WIDGETS, BACKGROUND, BASE_OVERVIEW
		WORKSPACE, ALL_APPS, OVERVIEW, WIDGETS, BACKGROUND, FALLBACK_OVERVIEW
		}

		public enum NavigationModel {ZERO_BUTTON, TWO_BUTTON, THREE_BUTTON}
		@@ -451,7 +451,7 @@ public final class LauncherInstrumentation {

		return waitForLauncherObject(OVERVIEW_RES_ID);
		}
		case BASE_OVERVIEW: {
		case FALLBACK_OVERVIEW: {
		return waitForFallbackLauncherObject(OVERVIEW_RES_ID);
		}
		case BACKGROUND: {
		@@ -739,6 +739,10 @@ public final class LauncherInstrumentation {
		return mDevice.getLauncherPackageName();
		}

		boolean isFallbackOverview() {
		return !getOverviewPackageName().equals(getLauncherPackageName());
		}

		@NonNull
		public UiDevice getDevice() {
		return mDevice;