Merge "Revert "Enable taskbar in overview by default"" into tm-qpr-dev (126d1783) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/config/FeatureFlags.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ public final class FeatureFlags {
		"Enables One Search box in Taskbar All Apps.");

		public static final BooleanFlag ENABLE_TASKBAR_IN_OVERVIEW = getDebugFlag(
		"ENABLE_TASKBAR_IN_OVERVIEW", true,
		"ENABLE_TASKBAR_IN_OVERVIEW", false,
		"Enables accessing the system Taskbar in overview.");

		public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag(

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

+11 −16

Original line number	Diff line number	Diff line
		@@ -790,7 +790,7 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(APPS_RES_ID);
		waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		checkTaskbarVisibility();
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);
		waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		return waitForLauncherObject(OVERVIEW_RES_ID);
		@@ -799,7 +799,7 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(APPS_RES_ID);
		waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		checkTaskbarVisibility();
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);

		waitForLauncherObject(SPLIT_PLACEHOLDER_RES_ID);
		return waitForLauncherObject(OVERVIEW_RES_ID);
		@@ -808,7 +808,7 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(APPS_RES_ID);
		waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		checkTaskbarVisibility();
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);
		waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		return waitForFallbackLauncherObject(OVERVIEW_RES_ID);
		@@ -820,26 +820,21 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		checkTaskbarVisibility();
		return null;
		}
		default:
		fail("Invalid state: " + containerType);
		return null;
		}
		}
		}

		private void checkTaskbarVisibility() {
		if (mIgnoreTaskbarVisibility) {
		return;
		return null;
		}

		if (isTablet() && !isFallbackOverview()) {
		waitForLauncherObject(TASKBAR_RES_ID);
		} else {
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);
		}
		return null;
		}
		default:
		fail("Invalid state: " + containerType);
		return null;
		}
		}
		}

		public void waitForLauncherInitialized() {