Revert "Halo: Add master switch to disable Halo (2/2)"

This reverts commit fe55abe988d6af9be0e9fe2d938a9e9519c9ff34.
String fixes

... and spanish translations

Change-Id: I5dd049fc443b830b0b7b74e57020253b8c94087a
Small cleanup
Brightness Control on Status Bar (2/2)

Added Support to control the current brightness to the Status Bar.
Revert "Brightness Control on Status Bar (2/2)"

This reverts commit 494b402fcbb547878c472a3d1adc43e8ed81a14c.
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean