Fix up quicksettings 1/2

revisit tile colors
Almost there
Battery tile fixed
Add back code in QuickSettings.java
Change-Id: I8fbdcc5dd6f2ada7e22d2b5b2c193153eaaa655f