timer cleanup

This change ensures the buttons are visible at the right times and
overloads return values from BaseAdapter to simplify the code.
(This cleanup was once part of c/255295 which was abandonded.)

Change-Id: Ic35e70d4045e28c74f30e156975151fde5c57a9f