Who helped rock to become more popular: Elvis or Bill Haley?

The media often says that Elvis invented and popularized rock and roll. However, in school we learned that Bill Haley had success with rock and roll before Elvis with 'Rock around the Clock' and contributed more to the genre than Elvis. If we follow our music teacher, rock was already quite popular thanks to Bill…