commit f862a26347b583bd84be22a8ceff4bc13158ec7e
author Sunny Goyal <sunnygoyal@google.com> Mon Dec 14 14:27:38 2015 -0800
committer Sunny Goyal <sunnygoyal@google.com> Wed Jan 06 10:16:44 2016 -0800
tree 1f5a38b3f23b23c90f39210501737077cafd5fc1
parent 52279f3bc3878a4e919ae32a7f62ee4bf8eb7070

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

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 509fbf8..4ebead5 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -52,7 +52,7 @@
 import com.android.launcher3.backup.BackupProtos.Widget;
 import com.android.launcher3.compat.UserHandleCompat;
 import com.android.launcher3.compat.UserManagerCompat;
-import com.android.launcher3.model.MigrateFromRestoreTask;
+import com.android.launcher3.model.GridSizeMigrationTask;
 import com.android.launcher3.util.Thunk;
 import com.google.protobuf.nano.InvalidProtocolBufferNanoException;
 import com.google.protobuf.nano.MessageNano;
@@ -315,7 +315,7 @@
             return true;
         }
 
-        if (MigrateFromRestoreTask.ENABLED &&
+        if (GridSizeMigrationTask.ENABLED &&
                 (oldProfile.desktopCols - currentProfile.desktopCols <= 1) &&
                 (oldProfile.desktopRows - currentProfile.desktopRows <= 1)) {
             // Allow desktop migration when row and/or column count contracts by 1.