QuickSettings (2/2)

cleanup

Conflicts:

	res/values/purity_arrays.xml
	res/values/purity_strings.xml
	res/xml/purity_system_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/slim/fragments/PieButtonFragment.java