aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Making 2 flags read only since they are used on backup and restore" into main

Browse Source
This commit is contained in:
Sebastián Franco
2024-03-14 20:12:05 +00:00
committed by Android (Google) Code Review
parent f6fd1f3d46 5ea61960ab
commit 892ffb8b15
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
aconfig/launcher.aconfig
View File

@@ -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

2
src/com/android/launcher3/model/GridSizeMigrationUtil.java
View File

@@ -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

2
src/com/android/launcher3/provider/RestoreDbTask.java
View File

@@ -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);

2
tests/src/com/android/launcher3/backuprestore/BackupAndRestoreDBSelectionTest.kt
View File

@@ -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

4
tests/src/com/android/launcher3/model/GridMigrationTest.kt
View File

@@ -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 =