Settings: Fix Notification Drawer icons.

Change-Id: I5fe6fcf23a97f7449aa964d5cf796018dd11abb5
[2/2] settings: Add Haptic Feedback to quicktiles

Conflicts:
	res/values/axxion_strings.xml
	res/xml/quick_settings_panel.xml
Quick Settings: Option to use floating window (2/2)

Allows the option of launching preferences from the quicksettings menu in a
floating window

Change-Id: I00237f6b667d35f0e8d2cf8201f4efee6adf762c

Conflicts:
	res/values/cm_strings.xml
	res/xml/quick_settings_panel.xml

Conflicts:
	res/values/axxion_strings.xml
	res/values/cm_strings.xml
	res/xml/quick_settings_panel.xml