Android: add name for Touch devices and simplification, from bug 3958
4 files changed