Merge "Making 2 flags read only since they are used on backup and restore" into main (892ffb8b) · Commits · e / os / BlissLauncher3

aconfig/launcher.aconfig

+4 −2

Original line number	Diff line number	Diff line
		@@ -188,19 +188,21 @@ flag {
		}

		flag {
		name: "grid_migration_fix"
		name: "enable_grid_migration_fix"
		namespace: "launcher"
		description: "Keep items in place when migrating to a bigger grid"
		bug: "325286145"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "narrow_grid_restore"
		name: "enable_narrow_grid_restore"
		namespace: "launcher"
		description: "Using only the most recent workspace when restoring to avoid confusion."
		is_fixed_read_only: true
		bug: "325285743"
		metadata {
		purpose: PURPOSE_BUGFIX

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ public class GridSizeMigrationUtil {
		return true;
		}

		if (Flags.gridMigrationFix()
		if (Flags.enableGridMigrationFix()
		&& srcDeviceState.getColumns().equals(destDeviceState.getColumns())
		&& srcDeviceState.getRows() < destDeviceState.getRows()) {
		// Only use this strategy when comparing the previous grid to the new grid and the

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ public class RestoreDbTask {
		// executed again.
		LauncherPrefs.get(context).removeSync(RESTORE_DEVICE);

		if (Flags.narrowGridRestore()) {
		if (Flags.enableNarrowGridRestore()) {
		String oldPhoneFileName = idp.dbFile;
		removeOldDBs(context, oldPhoneFileName);
		trySettingPreviousGidAsCurrent(context, idp, oldPhoneFileName);

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ class BackupAndRestoreDBSelectionTest {

		@Before
		fun setUp() {
		setFlagsRule.setFlags(true, Flags.FLAG_NARROW_GRID_RESTORE)
		setFlagsRule.setFlags(true, Flags.FLAG_ENABLE_NARROW_GRID_RESTORE)
		}

		@Test

+2 −2

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ class GridMigrationTest {

		@Before
		fun setup() {
		setFlagsRule.setFlags(false, Flags.FLAG_GRID_MIGRATION_FIX)
		setFlagsRule.setFlags(false, Flags.FLAG_ENABLE_GRID_MIGRATION_FIX)
		}

		private fun migrate(src: GridMigrationData, dst: GridMigrationData) {
		@@ -223,7 +223,7 @@ class GridMigrationTest {

		@Test
		fun `flagged 5x5 to 5x8`() {
		setFlagsRule.setFlags(true, Flags.FLAG_GRID_MIGRATION_FIX)
		setFlagsRule.setFlags(true, Flags.FLAG_ENABLE_GRID_MIGRATION_FIX)
		runTest(
		src = GridMigrationData(DB_FILE, DeviceGridState(5, 5, 5, TYPE_PHONE, DB_FILE)),
		dst =