Settings: Add preference for EdgeGesture service.

Change-Id: I0325b0a9aa6eb943b48483aebe151726a2c64ac4

Conflicts:
	res/values/cm_strings.xml

	modified:   res/values/cm_strings.xml
	modified:   res/xml/system_ui_settings.xml
QS: Make it possible to show smaller icons (2/2)

Change-Id: I974a8e17dfc5ae6b62af1ec87129c6f04508a865
CM PlatLogo: CyanogenMod version preference (2/2)

Binds the CyanogenMod version preference to launch CM easter egg
upon multiple taps.

Change-Id: I8e06642944d24581c0932c9964f2d9615bfcb832
Settings: Day and week on data usage cycle (2/2)

Adds the ability to set day and week on when the data usage
graph resets, instead of just month.

Change-Id: I5974e1b7143d09ffd6fcd6db113c3f7511346bfa

Conflicts:
	res/values/cm_arrays.xml

	modified:   res/layout/data_usage_cycle_editor.xml
	modified:   res/values/cm_arrays.xml
	modified:   res/values/strings.xml
	modified:   src/com/android/settings/DataUsageSummary.java
	modified:   src/com/android/settings/net/NetworkPolicyEditor.java
Allow changing screen-off animation (2/2)

* Allow enabling/disabling screen-off animation
* Allow selection between fade & crt effects if the device allows it

Change-Id: I5ebfab22e68ea34e3babfaacd9c8103e25932d3d

Conflicts:
	res/values/cm_arrays.xml

	modified:   res/values/cm_arrays.xml
	modified:   res/values/cm_strings.xml
	modified:   res/xml/display_settings.xml
	modified:   src/com/android/settings/DisplaySettings.java
Bleed keyguard widget picker list into translucent bars

Change-Id: Ie929845fd8b822dcf858b9b56cb5758379d55c59