Add Fast Charge QS Tile [2/2]

Change-Id: Iafd5ee0eefa9f7abd41b03ea7fa4e976c573e61c

Conflicts:
	res/values/custom_strings.xml
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java

Conflicts:
	src/com/android/settings/liquid/quicksettings/QuickSettingsUtil.java

Conflicts:
	src/com/android/settings/liquid/quicksettings/QuickSettingsUtil.java

Conflicts:
	src/com/android/settings/liquid/quicksettings/QuickSettingsUtil.java
Add On-The-Go Toggle [2/2]

Change-Id: Ia77e806e3b7fc4ab9956b3ffe890c830030788a0

Conflicts:
	res/values/ose_strings.xml
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java

Conflicts:
	res/values/ose_strings.xml

Conflicts:
	src/com/android/settings/liquid/quicksettings/QuickSettingsUtil.java

Conflicts:
	res/values/liquid_strings.xml
	src/com/android/settings/liquid/quicksettings/QuickSettingsUtil.java
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

Conflicts:
	res/values/liquid_strings.xml
	res/xml/liquid_battery_style.xml

Conflicts:
	res/values/liquid_strings.xml
[3/3] Settings: Audio Themes Settings

Conflicts:
	res/xml/sound_settings.xml

Fw/b: http://gerrit.dirtyunicorns.com/#/c/2148/
Fw/av: http://gerrit.dirtyunicorns.com/#/c/2149/

Change-Id: I8aad04a642441b91617943e6941841aec859396d

Conflicts:
	res/values/strings_custom.xml
	res/xml/sound_settings.xml

Conflicts:
	res/values/liquid_strings.xml
Separate Android Encryption Password from Lockscreen Password

This permits the use of a different (hopefully longer and more complex!) encryption
password, while using a simpler (and easier to type) lockscreen password.

Change-Id: Ib8c62c8eb4c86cd9e0117444231e8139c08ad1b6

Conflicts:
	res/values/custom_strings.xml
Statusbar clock font style + more fonts (2/2)

A combination commit of

https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/994fabdb0cda3c6d79b99b80df494b96e674c342
https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/b632e368d4070d7a701a66528edf7dd175c9cc46
https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/b35c1cfcfe4f10f3795fa8b4a45bf0b04527212a
https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/b9b2156221b71ca469f2552c51239c19d095bb53

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml

Conflicts:
	res/values/liquid_arrays.xml