From 219426f870e2e38e3b124619c7f1b34cc4b0b614 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Wed, 15 Apr 2020 14:46:03 -0700 Subject: [PATCH 1/2] Turn on V2 migration algorithm feature flag This flag is behind grid options master flag, so it won't go to all dogfood users yet. I will turn on grid options flag after enough bug bash, hopefully at the end of this week. Bug: 154154093 Test: N/A Change-Id: I608af1cd3c5613f7cc33a940a145309ac90a6c00 --- src/com/android/launcher3/config/FeatureFlags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 65d3cd2ded..df30f7bc77 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -127,7 +127,7 @@ public final class FeatureFlags { "ENABLE_DEEP_SHORTCUT_ICON_CACHE", true, "R/W deep shortcut in IconCache"); public static final BooleanFlag MULTI_DB_GRID_MIRATION_ALGO = getDebugFlag( - "MULTI_DB_GRID_MIRATION_ALGO", false, "Use the multi-db grid migration algorithm"); + "MULTI_DB_GRID_MIRATION_ALGO", true, "Use the multi-db grid migration algorithm"); public static final BooleanFlag ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER = getDebugFlag( "ENABLE_LAUNCHER_PREVIEW_IN_GRID_PICKER", true, "Show launcher preview in grid picker"); From 26c4e23e9a646243b4930820360f932fae5c9fa9 Mon Sep 17 00:00:00 2001 From: Pinyao Ting Date: Wed, 15 Apr 2020 22:25:06 -0700 Subject: [PATCH 2/2] fix GridBackupTableTest in comply with grid size migration Bug: 154166808 Test: GridBackupTableTest Change-Id: I7af35ceed7edb77ac0d9c443d7eccbcef19ae476 --- src/com/android/launcher3/LauncherProvider.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 8d20bd64df..ac3a5b0ca8 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -406,12 +406,8 @@ public class LauncherProvider extends ContentProvider { return result; } case LauncherSettings.Settings.METHOD_REFRESH_BACKUP_TABLE: { - // TODO(pinyaoting): Update the behavior here. - if (!MULTI_DB_GRID_MIRATION_ALGO.get()) { - mOpenHelper.mBackupTableExists = - tableExists(mOpenHelper.getReadableDatabase(), - Favorites.BACKUP_TABLE_NAME); - } + mOpenHelper.mBackupTableExists = tableExists(mOpenHelper.getReadableDatabase(), + Favorites.BACKUP_TABLE_NAME); return null; } case LauncherSettings.Settings.METHOD_RESTORE_BACKUP_TABLE: { @@ -451,11 +447,7 @@ public class LauncherProvider extends ContentProvider { } private void onAddOrDeleteOp(SQLiteDatabase db) { - if (MULTI_DB_GRID_MIRATION_ALGO.get()) { - // TODO(pingyaoting): Implement the behavior here. - } else { - mOpenHelper.onAddOrDeleteOp(db); - } + mOpenHelper.onAddOrDeleteOp(db); } /** @@ -674,7 +666,7 @@ public class LauncherProvider extends ContentProvider { } protected void onAddOrDeleteOp(SQLiteDatabase db) { - if (!MULTI_DB_GRID_MIRATION_ALGO.get() && mBackupTableExists) { + if (mBackupTableExists) { dropTable(db, Favorites.BACKUP_TABLE_NAME); mBackupTableExists = false; }