statusbar battery icons

Conflicts:
	res/values/arrays.xml