aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disabling home screen migration logic

Browse Source 
Change-Id: I506948852945bfb8ebd7a95fc951880ffe9a3e17
This commit is contained in:
Sunny Goyal
2015-08-11 12:10:34 -07:00
parent a1ee659e74
commit 6579e1eee8
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/LauncherBackupAgentHelper.java
View File

@@ -98,7 +98,7 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper {
LauncherAppState.getLauncherProvider().updateFolderItemsRank();
}
if (mHelper.shouldAttemptWorkspaceMigration()) {
if (MigrateFromRestoreTask.ENABLED && mHelper.shouldAttemptWorkspaceMigration()) {
MigrateFromRestoreTask.markForMigration(getApplicationContext(),
(int) mHelper.migrationCompatibleProfileData.desktopCols,
(int) mHelper.migrationCompatibleProfileData.desktopRows,

4
src/com/android/launcher3/LauncherBackupHelper.java
View File

@@ -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.

3
src/com/android/launcher3/LauncherModel.java
View File

@@ -1758,8 +1758,7 @@ public class LauncherModel extends BroadcastReceiver
int countX = (int) profile.numColumns;
int countY = (int) profile.numRows;
if (MigrateFromRestoreTask.shouldRunTask(mContext)) {
if (MigrateFromRestoreTask.ENABLED && MigrateFromRestoreTask.shouldRunTask(mContext)) {
long migrationStartTime = System.currentTimeMillis();
Log.v(TAG, "Starting workspace migration after restore");
try {

2
src/com/android/launcher3/model/MigrateFromRestoreTask.java
View File

@@ -37,6 +37,8 @@ import java.util.HashSet;
*/
public class MigrateFromRestoreTask {
public static boolean ENABLED = false;
private static final String TAG = "MigrateFromRestoreTask";
private static final boolean DEBUG = true;