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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -247,7 +247,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", false,
		"ENABLE_TASKBAR_IN_OVERVIEW", true,
		"Enables accessing the system Taskbar in overview.");

		public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag(

+10 −2

Original line number	Diff line number	Diff line
		@@ -827,7 +827,11 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(APPS_RES_ID);
		waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		if (isTablet()) {
		waitForSystemLauncherObject(TASKBAR_RES_ID);
		} else {
		waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID);
		}
		waitUntilSystemLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		return waitForSystemLauncherObject(OVERVIEW_RES_ID);
		@@ -836,7 +840,11 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(APPS_RES_ID);
		waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		if (isTablet()) {
		waitForSystemLauncherObject(TASKBAR_RES_ID);
		} else {
		waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID);
		}

		waitForSystemLauncherObject(SPLIT_PLACEHOLDER_RES_ID);
		return waitForSystemLauncherObject(OVERVIEW_RES_ID);