1) Fixed bug where getting event id not via MotionEventCompat.  2) refactoring