Android: Custom event refactor