fix steps and duration logic for swipe and flick
Merge pull request #1152 from jlipps/master

fix android swipe duration