Missing stuff
Immersive Mode tile (2/2)

Change-Id: I6491a9b16aa0726df2a8ea7a82282e667ecbf57c

Conflicts:
	res/values/strings.xml
	res/xml/power_menu_settings.xml
	src/com/oct/tentacles/fragments/sb/QuickSettingsUtil.java
Ported Slim's Battery settings

Change-Id: I4ea8f69df2c9c8ed09b2c6d9a9a4787466410467

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/oct/tentacles/fragments/pie/PieTab.java
Add Slim Clock settings

Change-Id: Id459c2577ae0da9a0e2c82eb432e31a7dc23f2f1

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/sb_clock_settings.xml
CF: Remove force overflow button option

Change-Id: I01de0695f255264734d1ee5bfc730ff34db3ddf8

Conflicts:
	src/com/oct/tentacles/fragments/ButtonSettings.java
Quicksettings tile update WIP

Change-Id: I8aa8c6e68ff26682ad9f76eb1df4a041db077cd2

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/quicksettings_tiles_style.xml
	res/xml/sb_quick_settings_panel.xml
	src/com/carbon/fibers/fragments/sb/QuickSettingsTiles.java
	src/com/oct/tentacles/SettingsActivity.java
	src/com/oct/tentacles/fragments/sb/DraggableGridView.java
	src/com/oct/tentacles/fragments/sb/QuickSettingsUtil.java
Add lockscreen blur and see through.

Change-Id: Iaf3c78c46a317bb8ccdd355465bd000f43dc9d26

Conflicts:
	res/values/strings.xml
	res/xml/lockscreen_general.xml
	src/com/oct/tentacles/fragments/ls/KeyguardSettings.java
Lockscreen Notifications [2/2]

- Enable/disable lockscreen notifs
- Pocket mode
- Show always
- Hide Low Priority
- Hide Non Clearable
- Allow dismissing non clearable notifications
- Eenable/disable expanded notifications
- Force expanded view

Change-Id: I74e346807d49a8b8002c8e70e45e81242ea1d695

Lockscreen Notifications: wake on notification

Change-Id: I62be48d522f7f22786c796619cbd8f94dcd014e5

Lockscreen Notifications: make notification count user configurable

Change-Id: Ief5238f6eaa525788b6c29806d2d1ee210ee346a

Lockscreen Notifications: disable notification count when notfifs are disabled

Lockscreen Notifications: check for proximity sensor

Lockscreen Notifications: make offset top user configurable & add privacy mode [2/2]

Change-Id: I806de98e2a65e8bd13177e6d486df3d3a8085fbc

Change-Id: I74e346807d49a8b8002c8e70e45e81242ea1d695

Conflicts:
	res/xml/lockscreen_notifications.xml
	res/xml/preference_headers.xml
System bar color WIP

Change-Id: I366e0fd450ea9d24de6e44e8e682cb78b4747dbd

Conflicts:
	res/values/strings.xml
	res/xml/sb_general_settings.xml
Status icon color (2/2)

Check frameworks

Change-Id: Ic8d0e55adba82d91be9ea8814f8650ab62cd3b4c

Conflicts:
	res/xml/sb_general_settings.xml
	src/com/oct/tentacles/fragments/sb/SbGeneralSettings.java
Statusbar: double-tap to sleep (settings part)

Change-Id: Ifb8f1ab1d84ba39942357ee6f8694764799d4103
Add global action for screen recording. [2/2]

See http://review.chameleonos.org/#/c/2702/ (no common commits, had to port to Carbon Fibers)

Change-Id: Ib903a3de72b3c00a5c9afec06b0c849a5bfc7aa6

Conflicts:
	res/values/strings.xml
	res/xml/power_menu_settings.xml
Settings: QuickRecord Tile (2/2)

PS2: Forgot to set image name.

Change-Id: Ib20d4c7231f147674ed3afd4c438bd83aedbac1d

Conflicts:
	res/values/slim_strings.xml
	src/com/carbon/fibers/fragments/sb/QuickSettingsUtil.java

Change-Id: Ib20d4c7231f147674ed3afd4c438bd83aedbac1d

Conflicts:
	src/com/oct/tentacles/fragments/sb/QuickSettingsUtil.java
Move LockScreen Notifications to Lockscreen

Doing so in prep to get ActiveDisplay as a tab as well

PS2: add ActiveDisplay

Change-Id: I8abd18bcf55b3cf72197dea0f0938d82ad2bc2d0

Conflicts:
	res/values/strings.xml
	res/xml/preference_headers.xml
	src/com/oct/tentacles/fragments/ls/KeyguardSettings.java
[2/2] CarbonFibers: Add ActiveDisplay settings to menu

Base: http://review.carbon-rom.com/1344
Settings: http://review.carbon-rom.com/1345

PS2: fixup
PS3: fixup2
PS4: missed attrs
PS5: missed another omni!
PS6: derp.  didn't commit...
PS7: duplicates...
PS8: change settings to fibers
PS9: fixup, missing more imports...
PS10: moar imports!
PS11: remove SeekBarPreference.java
PS12: remove "other" SeekBarPreference.java
PS13: change settings to fibers moar
PS14: swap ChaOS ActiveDisplaySettings + other fixes
PS15: add header + icon, builds but FC's?
PS16: try to fix FC, to no avail
PS17: fix commit message (only 2/2, not 3/3)
PS18: Update SettingsActivity.java (thx Andros)
PS19: fixup slider issue (import SliderPref from Omni)
PS20: add better looking images (thanks ShinySide)
PS21: Remove icons, move to LockScreen Settings in CF
PS22: cleanup whitespace from preference_headers.xml, attempt fixup (still broken)

Change-Id: Id52d4831979ae893f5899de953458054f00c5b79

Conflicts:
	res/layout/seek_bar_preference.xml
	res/values/attrs.xml
	res/values/strings.xml
	res/xml/active_display_settings.xml
	src/com/oct/tentacles/fragments/ls/KeyguardSettings.java
[2/2] CarbonFibers: Pimp up ActiveDisplay

Base part: http://review.carbon-rom.com/#/c/1370/

PS2: fix merge conflict

Conflicts:

	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	res/xml/active_display_settings.xml

Change-Id: I8abf7a3018e7e0168860861ac240975cd1f8a2b0

Conflicts:

	res/xml/active_display_settings.xml

Change-Id: I8abf7a3018e7e0168860861ac240975cd1f8a2b0

Conflicts:
	res/values/strings.xml
	res/xml/active_display_settings.xml
	src/com/oct/tentacles/fragments/ls/ActiveDisplaySettings.java
[2/2] CarbonFibers: Fix pimp up ActiveDisplay

Base part: http://review.carbon-rom.com/1373

Conflicts:

	res/values/custom_arrays.xml
	res/values/custom_strings.xml

Change-Id: Ief2aa6802ad25a86b49d06bab1b9e34140dc5db5

Conflicts:
	res/values/strings.xml
	res/xml/active_display_settings.xml
	src/com/oct/tentacles/fragments/ls/ActiveDisplaySettings.java
Statusbar clock font style (2/2)

PS1: Initial

Change-Id: I1f0f7f67cc5122b2c2e1351f289a2e4a6c10f920

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Cleanup

Change-Id: I9cd155e539897ca7fa0b3681e692d3166e6e0763

Conflicts:
	res/xml/sb_general_settings.xml
	src/com/oct/tentacles/fragments/sb/SbGeneralSettings.java
Fix alphabetical order to power menu

PS2: fix tabs/whitespace

Change-Id: Ied2528863d6ec104085d2ade87cc5de119203860

Conflicts:
	res/xml/power_menu_settings.xml