(Android) Input - get rid of device enums and device variable