Adding better tap support for android device.