moving more stuff into an AndroidDevice class