diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-11 12:10:34 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-11 12:10:34 -0700 |
| commit | 6579e1eee8a6fce44f020d40c3bbdbf245d6c12c (patch) | |
| tree | a712d7425cfb1fe888a990276512f2cbe1378f6b /src/com/android/launcher3/LauncherBackupHelper.java | |
| parent | a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44 (diff) | |
| download | android_packages_apps_Trebuchet-6579e1eee8a6fce44f020d40c3bbdbf245d6c12c.tar.gz android_packages_apps_Trebuchet-6579e1eee8a6fce44f020d40c3bbdbf245d6c12c.tar.bz2 android_packages_apps_Trebuchet-6579e1eee8a6fce44f020d40c3bbdbf245d6c12c.zip | |
Disabling home screen migration logic
Change-Id: I506948852945bfb8ebd7a95fc951880ffe9a3e17
Diffstat (limited to 'src/com/android/launcher3/LauncherBackupHelper.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherBackupHelper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java index 136556b92..2d11d3af1 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.Screen; 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 @@ public class LauncherBackupHelper implements BackupHelper { 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. |