fixed onTouch handlers

Change-Id: I72ce9d94fa5471fa544281d1c2b83f68f49dc997