Revert "Revert "settings: Add xxhdpi profile icon""

This reverts commit a97c4b862d5331df2252df50df9931a8574650c0.

Change-Id: I23473bf86dec09bf4d4a26287f911f25f5c21668
Merge "Revert "Revert "settings: Add xxhdpi profile icon""" into cm-11.0
New setting under "Debug settings" that enables the development shortcut

Resolve Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java

Change-Id: I9a43e611911f2e278605715f714860ad11236fd9
settings: Fix build

Change-Id: Ia6a4bed9e8184f031ef1ef5be90516ca0714ee4f
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Revert "settings: Fix build"

This reverts commit 048637c00b814e534681293215cd2101b308f8c0.

Change-Id: I98ffeaff6573bfcfc5eb69b1ea49a50eb0a22013
Fix the build

This shouldn't be there in the first place
It's a result of a failed rebase

Change-Id: I48610dfc4214a096b1c4af61af59bf52c5e50529
Advanced reboot enabled by default (2/2)

Change-Id: Ibb6f36b17809041e8cc91fd074a1364e04104a5e
Settings: MediaScanner behavior on boot (3/3)

Change-Id: I5049cea4ac2b2dd17297bbd163cc13a7429bcba4
disable camera sounds (1/3)

Change-Id: I9c61ac497cac1af1cc8771317ada059a417b4c03

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/SoundSettings.java
AOKP custom system animations (2/2)

ported fom here: http://gerrit.aokp.co/#/c/12305/

Thanks to Steve Spear

Change-Id: Ic692025b0db02dd01684b4e9f91d63a04f80181f

Conflicts:
	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/SettingsPreferenceFragment.java
App sidebar (2/2)

Change-Id: I9aae5e80960e5037e7aa69019004d4dda91f282a
Setting: Add support to enable/disable Electron Beam (2/2)

Change-Id: Ia3060c2e66ef9a21c09e1007dc3b6a016c25a076
[2/2] ElectronBeam: Add an alternative screen-off animation

Change-Id: I9a865715d660831c8b4fe7ddc1f8e070579d1ac0
[2/2] Add battery level around unlock ring

Credits to Omnirom

Change-Id: I0115f0a6f52b02f3f3da0412ae4fa0dd77c02ae0
Add volume button music control

Change-Id: I0b86e2924b5578a30defae36484f6355e1fe0d1f
Allow toggling of status_bar_show_battery_percentage [2/2]

Change-Id: I5b95d6009a786d313233caed6faf5f9272a59d86
Forward port statusbar brightness control

Change-Id: If9a5e9e61bd4e49e83a5cea7ba5aa296c7120328
Custom carrier text [2/2]

Change-Id: I328b8eb9781fd0f4424bf53f8e5d0b7e82f0ad0a
RAM bar (2/2)

Thanks to @kufikugel for hole code ported from 4.3

Change-Id: I33759e87434109e28a0f25be097b5b4aebb43606
Port OnClick Fliptile animation. (2/2)

credits to: TeamBAMF for the original work.

Change-Id: Ie24f6917fab27b5215660f0b0aaa5427aa5b6d1e

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