Quick Settings customization (2/2)

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_hp.png
	packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_hp.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_hp.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_hp.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_hp.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_hp.png
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java