[2/2] Settings: volume wake
add Button Settings category
[2/2] settings: add CPU info overlay

this shows
CPU temp (if available)
for every core governor + online + freq

Change-Id: I28c1e48c2e613b33c301b61cead70678ab6a2e9b

Conflicts:

	res/values/custom_strings.xml

Conflicts:

	res/values/mahdi_strings.xml
Settings: Add bridge to PerformanceControl

xplodwild authored 15 days ago

Conflicts:

	Android.mk
	res/values/mahdi_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java
embed SuperSU into settings

Conflicts:

	res/values/mahdi_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java
ButtonSettings.java: import com.android.settings.R;