commit 6579e1eee8a6fce44f020d40c3bbdbf245d6c12c
author Sunny Goyal <sunnygoyal@google.com> Tue Aug 11 12:10:34 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Tue Aug 11 12:10:34 2015 -0700
tree a712d7425cfb1fe888a990276512f2cbe1378f6b
parent a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44

Disabling home screen migration logic

Change-Id: I506948852945bfb8ebd7a95fc951880ffe9a3e17

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 136556b..2d11d3a 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -52,6 +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.util.Thunk;
 import com.google.protobuf.nano.InvalidProtocolBufferNanoException;
 import com.google.protobuf.nano.MessageNano;
@@ -314,7 +315,8 @@
             return true;
         }
 
-        if ((oldProfile.desktopCols - currentProfile.desktopCols <= 1) &&
+        if (MigrateFromRestoreTask.ENABLED &&
+                (oldProfile.desktopCols - currentProfile.desktopCols <= 1) &&
                 (oldProfile.desktopRows - currentProfile.desktopRows <= 1)) {
             // Allow desktop migration when row and/or column count contracts by 1.