(Android) Rewrite new input code some more