Samsung Galaxy S7 to have versions with curved and flat displays