Add native java screen recorder [2/2]
Screen Recorder Cleanup

Credit: Steve Spencer
Toast Animations [2/2]

Change-Id: Ibd36ad85472365c1f77726187093c991160fe55f

Conflicts:
	res/values/custom_strings.xml
	res/values/ose_arrays.xml
	res/xml/animations.xml
	src/com/android/settings/du/Animations.java

Conflicts:
	res/values/liquid_arrays.xml
Add Toast Preview to Toast Animations

Change-Id: I15f139dbd92dddce03e7210d2c8a84b13b315052

Conflicts:
	src/com/android/settings/du/Animations.java
Settings: Notification Reminder Interval (2/2)

Change-Id: I379f17ae3be4ad278f74f45bf9e489db2d010b62

Conflicts:
	res/values/liquid_arrays.xml
	res/values/liquid_strings.xml
	res/xml/notification_drawer_qs_settings.xml
SlimRecent: Make it optional [2/2]

PS1: restart SystemUI espcially for what all that it is doing \:

Conflicts:
	res/values/probam_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/SystemUiSettings.java
fix recents switcher
	modified:   src/com/android/settings/liquid/InterfaceSettings.java
Give the OTA app a new home
Stats summary
Replace Performance control with Kernel Tweaker (2/3)

Based on Dirty Unicorns commit
Status Bar Color [2/2]

Change-Id: Ie84b681343356675277319fd667375cc99924d19

Conflicts:
	AndroidManifest.xml
	res/values/custom_strings.xml
	res/xml/dirtytweaks.xml

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/ic_dt_omniswitch.png
	res/drawable-hdpi/ic_liquid_interface.png
	res/drawable-hdpi/ic_ose_omniswitch.png
	res/drawable-mdpi/ic_dt_omniswitch.png
	res/drawable-mdpi/ic_ose_omniswitch.png
	res/drawable-xhdpi/ic_liquid_interface.png
	res/drawable-xhdpi/ic_ose_omniswitch.png
	res/values/liquid_strings.xml
	res/xml/status_bar_settings.xml
Settings: IME animations (2/3)

Destiled from here:
https://gerrit.omnirom.org/#/c/4249/32

PS2: something

Change-Id: I7a8135818c57929b612f4fcccdc425a49b72ae59

Conflicts:
	res/values/arrays_aicp.xml
	res/values/strings_aicp.xml
	res/xml/aicp_display_animations_settings.xml

Conflicts:
	res/menu/ram_bar_settings.xml
	res/values/liquid_strings.xml

Conflicts:
	src/com/android/settings/liquid/StatusBarColor.java
Settings: Custom scrolling values 2/2

ported from https://gerrit.omnirom.org/#/c/4249/
originally written by Yanuar Harry <ai.the.smarties.physics@gmail.com>

PS2: make help icon not selectable and fix capitalization consistency

Change-Id: I89cac4e9c2f5a495339a8495bce11e42f49ee05e

Conflicts:
	res/values/attrs_custom.xml
	res/values/strings_aicp.xml
	res/xml/aicp_display_animations_settings.xml

Conflicts:
	res/values/liquid_strings.xml
Settings: Port BatteryBar (2/2)

{x} Adds Battery bar with following features:
{x} location set
{x} color
{x} aligment
{x} thickness
{x} charging animation

Change-Id: Ic8a201c20c07afefae58c87795fa8f1d72369135

Settings: update battery bar default color to match kitkat ui (2/2)

Change-Id: If66f97b7e770ac2ac916cf1df4f0792616061714

Conflicts:
	res/values/arrays_aicp.xml
	res/values/strings_aicp.xml
	res/xml/aicp_battery_style.xml
	src/com/android/settings/ose/BatteryIconStyle.java

Conflicts:
	res/values/liquid_strings.xml
	src/com/android/settings/liquid/BatteryIconStyle.java
Squash sidebar commits from ChaOS

- Add ability to exclude apps from the sidebar
- Add user selectable size for sidebar
- Inital App sidebar commit

Conflicts:
	AndroidManifest.xml
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	res/xml/dirtytweaks.xml

Conflicts:
	res/values/liquid_strings.xml
	res/xml/misc_tweaks.xml
Move Quick Ribbons and remove Link options
Move animation control from interface to Display
Revert "Squash sidebar commits from ChaOS"

This reverts commit 582e68e9aa26dd53e9f932233bf81b98e8164b89.

Conflicts:
	res/xml/liquid_interface_settings.xml
Settings Smart PullDown to SlimActions (2/2)

PS2: Reverse dependency until Recents
	Preload situation decided.

Change-Id: Icacca5c385b843de4e5c690d3cdacdfe003dc948
Settings: Recents to SlimActions Shortcut (2/2)

PS2: Reverse dependency
PS3: Simulate Virtual Key Press for Recents

Change-Id: Ia740033db91c235fbfb0be569af7382cbf58a8b1

Conflicts:
	src/com/android/settings/liquid/LiquidActionShortcut.java