Thats pretty much the way I understand it as well. Not 100% on LIon charging, but I think is a constant voltage charge (4.2v per cell which would tie in with your figures) and Charge detection based on a drop off in current.
NiMH however (like NiCads) use a constant CURRENT charge with detection using either a slight drop in cell voltage at full charge, or the rise in cell temperature. I believe NiMH also like a fast charge.