App Circle Bar Toggle [2/2]

Change-Id: I5deb3bb90810253097aca0db1e51eba6431c3744

Conflicts:
	AndroidManifest.xml
	res/values/custom_strings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/crom/quicksettings/QuickSettingsUtil.java
Heads Up Toggle [2/2]

Change-Id: I92231fa940955afcdc5772c15fb0df7a32f07870

Conflicts:
	AndroidManifest.xml
	res/values/custom_strings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/crom/quicksettings/QuickSettingsUtil.java
......