fix incompatibilities with aokp quick settings

patchset 2:
    fix main activity code style, keep compatibility with both code styles

patchset 3:
    clean up

Change-Id: I0e1e9d7dbdcc1415f5a10c20686b95ad3be42f5b