More battery styles (2/2)

Signed-off-by: igio90 <giovanni.rocca.90@gmail.com>
Development Settings: Don't reset root access when disabled

Root access is now managed by the Superuser settings menu.
Resetting this here is arbitrary and misleading.

Signed-off-by: igio90 <giovanni.rocca.90@gmail.com>
Merge branch 'bam6' of github.com:iGio90/android_packages_apps_Settings into bam6
tracking the right icons

Signed-off-by: igio90 <giovanni.rocca.90@gmail.com>