Merge "Fixing wrong check for grid migration" into ub-launcher3-master (eb04b841) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/model/GridSizeMigrationTask.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -918,7 +918,7 @@ public class GridSizeMigrationTask {
	String gridSizeString = getPointString(idp.numColumns, idp.numRows);		String gridSizeString = getPointString(idp.numColumns, idp.numRows);

	if (gridSizeString.equals(prefs.getString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, "")) &&		if (gridSizeString.equals(prefs.getString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, "")) &&
	idp.numHotseatIcons != prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons)) {		idp.numHotseatIcons == prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons)) {
	// Skip if workspace and hotseat sizes have not changed.		// Skip if workspace and hotseat sizes have not changed.
	return true;		return true;
	}		}