Merge "Make QSB_ON_FIRST_SCREEN a boolean." into ub-launcher3-master (f1d72926) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -1771,12 +1771,11 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		@Override
		public void bindScreens(IntArray orderedScreenIds) {
		// Make sure the first screen is always at the start.
		if (FeatureFlags.QSB_ON_FIRST_SCREEN.get() &&
		if (FeatureFlags.QSB_ON_FIRST_SCREEN &&
		orderedScreenIds.indexOf(Workspace.FIRST_SCREEN_ID) != 0) {
		orderedScreenIds.removeValue(Workspace.FIRST_SCREEN_ID);
		orderedScreenIds.add(0, Workspace.FIRST_SCREEN_ID);
		} else if (!FeatureFlags.QSB_ON_FIRST_SCREEN.get()
		&& orderedScreenIds.isEmpty()) {
		} else if (!FeatureFlags.QSB_ON_FIRST_SCREEN && orderedScreenIds.isEmpty()) {
		// If there are no screens, we need to have an empty screen
		mWorkspace.addExtraEmptyScreen();
		}
		@@ -1792,7 +1791,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		int count = orderedScreenIds.size();
		for (int i = 0; i < count; i++) {
		int screenId = orderedScreenIds.get(i);
		if (!FeatureFlags.QSB_ON_FIRST_SCREEN.get() \|\| screenId != Workspace.FIRST_SCREEN_ID) {
		if (!FeatureFlags.QSB_ON_FIRST_SCREEN \|\| screenId != Workspace.FIRST_SCREEN_ID) {
		// No need to bind the first screen, as its always bound.
		mWorkspace.insertNewWorkspaceScreenBeforeEmptyScreen(screenId);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -729,7 +729,7 @@ public class LauncherProvider extends ContentProvider {
		convertShortcutsToLauncherActivities(db);
		case 26:
		// QSB was moved to the grid. Clear the first row on screen 0.
		if (FeatureFlags.QSB_ON_FIRST_SCREEN.get() &&
		if (FeatureFlags.QSB_ON_FIRST_SCREEN &&
		!LauncherDbUtils.prepareScreenZeroToHostQsb(mContext, db)) {
		break;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -487,7 +487,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
		* @param qsb an existing qsb to recycle or null.
		*/
		public void bindAndInitFirstWorkspaceScreen(View qsb) {
		if (!FeatureFlags.QSB_ON_FIRST_SCREEN.get()) {
		if (!FeatureFlags.QSB_ON_FIRST_SCREEN) {
		return;
		}
		// Add the first page
		@@ -794,7 +794,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
		int id = mWorkspaceScreens.keyAt(i);
		CellLayout cl = mWorkspaceScreens.valueAt(i);
		// FIRST_SCREEN_ID can never be removed.
		if ((!FeatureFlags.QSB_ON_FIRST_SCREEN.get() \|\| id > FIRST_SCREEN_ID)
		if ((!FeatureFlags.QSB_ON_FIRST_SCREEN \|\| id > FIRST_SCREEN_ID)
		&& cl.getShortcutsAndWidgets().getChildCount() == 0) {
		removeScreens.add(id);
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -68,9 +68,8 @@ abstract class BaseFlags {
		// When enabled the promise icon is visible in all apps while installation an app.
		public static final boolean LAUNCHER3_PROMISE_APPS_IN_ALL_APPS = false;

		public static final TogglableFlag QSB_ON_FIRST_SCREEN = new TogglableFlag("QSB_ON_FIRST_SCREEN",
		true,
		"Enable moving the QSB on the 0th screen of the workspace");
		// Enable moving the QSB on the 0th screen of the workspace
		public static final boolean QSB_ON_FIRST_SCREEN = true;

		public static final TogglableFlag EXAMPLE_FLAG = new TogglableFlag("EXAMPLE_FLAG", true,
		"An example flag that doesn't do anything. Useful for testing");

+1 −1

Original line number	Diff line number	Diff line
		@@ -262,7 +262,7 @@ public class LauncherPreviewRenderer implements Callable<Bitmap> {
		}

		// Add first page QSB
		if (FeatureFlags.QSB_ON_FIRST_SCREEN.get()) {
		if (FeatureFlags.QSB_ON_FIRST_SCREEN) {
		View qsb = mHomeElementInflater.inflate(
		R.layout.search_container_workspace, mWorkspace, false);
		CellLayout.LayoutParams lp =