aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor migrateGridIfNeeded to pass the grid states and make it easier for unit testing

Browse Source 
No-op change

Bug: 325286145
Flag: NA
Test: compiling
Change-Id: I703c08059b81e20111c17a142dc54335f18a5a87
This commit is contained in:
Sebastian Franco
2024-03-04 13:43:52 -06:00
parent 8833826b00
commit c3ffd41ff0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,12 +105,10 @@ public class GridSizeMigrationUtil {
*/
public static boolean migrateGridIfNeeded(
@NonNull Context context,
@NonNull InvariantDeviceProfile idp,
@NonNull DeviceGridState srcDeviceState,
@NonNull DeviceGridState destDeviceState,
@NonNull DatabaseHelper target,
@NonNull SQLiteDatabase source) {
DeviceGridState srcDeviceState = new DeviceGridState(context);
DeviceGridState destDeviceState = new DeviceGridState(idp);
if (!needsToMigrate(srcDeviceState, destDeviceState)) {
return true;
}

8
src/com/android/launcher3/model/ModelDbController.java
View File

@@ -308,8 +308,12 @@ public class ModelDbController {
mOpenHelper = (mContext instanceof SandboxContext) ? oldHelper
: createDatabaseHelper(true /* forMigration */);
try {
return GridSizeMigrationUtil.migrateGridIfNeeded(mContext, idp, mOpenHelper,
oldHelper.getWritableDatabase());
// This is the current grid we have, given by the mContext
DeviceGridState srcDeviceState = new DeviceGridState(mContext);
// This is the state we want to migrate to that is given by the idp
DeviceGridState destDeviceState = new DeviceGridState(idp);
return GridSizeMigrationUtil.migrateGridIfNeeded(mContext, srcDeviceState,
destDeviceState, mOpenHelper, oldHelper.getWritableDatabase());
} catch (Exception e) {
FileLog.e(TAG, "Failed to migrate grid", e);
return false;