Actually air brakes come in several different flavors.
Most are drum brakes with 'S'-cams to operate them.
But there are more and more buses and trucks equipped with air disc brakes that use similar air cans to operate them. Air disc brakes have many of the same advantages as the disc brakes used on light duty trucks and most new cars. The big disadvantage at this point is it usually costs more for one rotor than it costs to do a brake job on a complete axle with conventional 'S'-cam air brakes. Bendix Spicer Foundation Brake - Air Disc Brakes
On some air brake equipped buses and trucks instead of 'S'-cams to operate them they used wedges. An air can was attached to a wedge that was used to separate the brake shoes that applied the brakes. It was a good idea in theory that never worked as well as an 'S'-cam.
Prior to about 1975 all hydraulic brake equipped buses used basically the same drum brakes as had been used for more than 50 years. The only real difference was the brakes were much wider than they had been years before.
IHC started to phase in disc brakes as an option in the mid- to late-70's on all hydraulic brake equipped buses (I owned a 1978 IHC conventional chassis bus that had drum brakes on the front axle and disc brakes on the rear axle). By the early '80's disc brakes became standard on both the front and rear axles of all IHC hydraulically braked buses.
Initially hydraulic disc brakes were a whole lot more expensive to service but now that they have been in service for quite a few years the price is about the same to service a bus with disc brakes as well as drum brakes. At the same time the drum brakes were being phased out electric over hydraboost systems were being phased in over vacuum hydroboost systems.
So in answer to your original question, yes brakes are still either disc or drum. The big difference is air vs. hydraulic.