I think the transfer is made in 24 hours since you arrived Shanghai. UK is not in the list of visa free countries of Shanghai (with 48 hours), but any country can make an transfer in Shanghai without a visa (not allowed to get out of the airport unless you have a transit visa). Or you should have the flight from Japan to Pudong and make transfer within Pudong Airport.