diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-14 14:27:38 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-01-06 10:16:44 -0800 |
commit | f862a26347b583bd84be22a8ceff4bc13158ec7e (patch) | |
tree | 1f5a38b3f23b23c90f39210501737077cafd5fc1 /src/com/android/launcher3/LauncherBackupAgentHelper.java | |
parent | 52279f3bc3878a4e919ae32a7f62ee4bf8eb7070 (diff) | |
download | android_packages_apps_Trebuchet-f862a26347b583bd84be22a8ceff4bc13158ec7e.tar.gz android_packages_apps_Trebuchet-f862a26347b583bd84be22a8ceff4bc13158ec7e.tar.bz2 android_packages_apps_Trebuchet-f862a26347b583bd84be22a8ceff4bc13158ec7e.zip |
Extending the grid migration logic to handle density changes
For hotseat migratino, we simply drop the items with least weight
If the workspace row/column decreases by 2 or more, we clear the whole workspace
Bug: 25958224
Change-Id: I7131b955023d185ed10955f593184b9238546dc8
Diffstat (limited to 'src/com/android/launcher3/LauncherBackupAgentHelper.java')
-rw-r--r-- | src/com/android/launcher3/LauncherBackupAgentHelper.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherBackupAgentHelper.java b/src/com/android/launcher3/LauncherBackupAgentHelper.java index 0773bf27c..bf9c66822 100644 --- a/src/com/android/launcher3/LauncherBackupAgentHelper.java +++ b/src/com/android/launcher3/LauncherBackupAgentHelper.java @@ -24,7 +24,7 @@ import android.database.Cursor; import android.os.ParcelFileDescriptor; import android.util.Log; -import com.android.launcher3.model.MigrateFromRestoreTask; +import com.android.launcher3.model.GridSizeMigrationTask; import java.io.IOException; @@ -101,8 +101,9 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper { LauncherSettings.Settings.METHOD_UPDATE_FOLDER_ITEMS_RANK); } - if (MigrateFromRestoreTask.ENABLED && mHelper.shouldAttemptWorkspaceMigration()) { - MigrateFromRestoreTask.markForMigration(getApplicationContext(), + // TODO: Update this logic to handle grid difference of 2. as well as hotseat difference + if (GridSizeMigrationTask.ENABLED && mHelper.shouldAttemptWorkspaceMigration()) { + GridSizeMigrationTask.markForMigration(getApplicationContext(), (int) mHelper.migrationCompatibleProfileData.desktopCols, (int) mHelper.migrationCompatibleProfileData.desktopRows, mHelper.widgetSizes); |