Revert "Carbon Easter Egg (2/2)"

This reverts commit e5b47b4bb445961394dc19dc133b73cbefa063a1.
OctOS Easter Egg(2/2)

Thanks to CarbonDev for their easter egg commit!
Also removed obsolete directory "oct", it was missed from moving Quick Tiles to Tentacles

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: I3d28e5a81efca83b946c514dbb28b321a8660f68
OctOs-Fy CarbonFibers

Change-Id: If8ce49c02d518ba485dc308c27de36b671ee7147
More clean up of strings and renaming directory for OctOS

Change-Id: Ib802b677b1160a7b287f6844ab05409cedead1ee
Relocate Tentacles entry point to Build Date

Change-Id: I1fd7189fe9aa10d4438aed26edccaf0a0565e8a6
Revert "Switch to new Superuser"

This reverts commit aa277b96ea522ddf60036ace15b836b148423f91.

Conflicts:
	Android.mk
	AndroidManifest.xml
	proguard.flags
	src/com/android/settings/cyanogenmod/superuser/PolicyNativeFragment.java

Change-Id: If584b5ae28ab143fd3e6a32c7c8c30fbaba4b99d
Revert "Add the themes configuration entry point"

This reverts commit 8e0c2de34fdcc6aa9a11b472bc290d7067de7771.

Conflicts:
	res/values/strings.xml
	res/xml/settings_headers.xml

Change-Id: Ie7303af420990642d2e0677ecd9f32e3277fed60

Conflicts:
	res/xml/settings_headers.xml
Fix

Change-Id: I440c9d4c96c3c3077377cda8fa68a8b0ef835c6a
Oct version not Tentacles version
OctOS version not Tentacles version
Theme Manager: add entry point
Performance control [1/2]
Fix for Force RTL prefernce reset after boot

https://jira.carbonrom.org/browse/CROM-7

Change-Id: Ibe824497f31e62c5f9d43678f70ddef6f473023c
cmhw: Use hardware's default value for color enhancement

 * First boot should use the value read from sysfs rather than
   forcing the feature to be enabled.

Change-Id: Ibed5d8f3dc3644f972caf07853ca921c963dacfa
Settings: Create SAR level preference, allow overlay.

Change-Id: I1af616696702f72b8a6276b3b01e940d61735137

Conflicts:
	res/values/cr_strings.xml
Settings: Set untranslatable

Change-Id: I0702378bab455a7ccf95a174e36bc792d26feec8
msim: Use the SIM operator to label the subscription

network operator is confusing, and downright misleading in roaming
cases

Change-Id: I3f645bbf1191f086ec0b6ca6cc8669915b2902a4
Settings: refactor Profiles to be more user friendly

* Remove the notion of Profile app groups
* Rearrange profile setup flow, now we first present the user with ways
which will trigger the profile, then allow them to set what happens when
the profile is triggered.

Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/cr_dimens.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/profiles/AppGroupConfig.java
	src/com/android/settings/profiles/ProfilesSettings.java

Change-Id: I2870df894046cd43c21c67991fb5efc9c3fec837
Settings: Fix NPE in Superuser settings.

Change-Id: I4671a7840df4a6b66c43d99c7f37cc8038829f08
Settings: Check if NFC is supported prior to adding to pager.

  - Also fix codestyle and comments for TriggerFragments

Change-Id: Iae0bcf8ca6a5447e70750e258db9599dd8a2704e