Merge pull request #86 from Anu6is/cleanup

Code Cleaning
(cherry picked from commit 6bdd5655da7c03bbd153053f35137b07a236c27a)

Conflicts:
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
orig files
Revert "orig files"

This reverts commit a822d6d5d014bc396d61f29b66c3b52ec66b92c8.