Tea in Shanghai

During my short visit to Shanghai last month, a group of us went to South Beauty Restaurant in Pudong area for dinner. I ordered white tea and was surprised to find dozens of leaves floating in my cup. That was the first time I was served tea in China. One of my colleagues then explained that was the practice of serving tea in China. The water is boiling anyway, so you wait for a few minutes until the leaves eventually float to the bottom of the cup. But if you don't want to wait, you can use the lid to hold back the leaves being sucked in while sipping your tea. The wait staff then refills your cup throughout your dinner. The tea was delicious. But of course I forgot to ask the name of it :-( 

My cute cup or gaiwan