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

Conflicts:
	res/values/liquid_arrays.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

Conflicts:
	res/values/liquid_arrays.xml
	res/values/liquid_strings.xml
	res/xml/display_settings.xml
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

Conflicts:
	res/values/liquid_strings.xml
	res/xml/display_settings.xml
Multi-user support for phones [2/2]

Allow multi-user for all devices without hardcoding it on

based on this commit
https://github.com/VanirAOSP/packages_apps_Settings/commit/5b2ba371217ec0ce30db742f85076a62c041b8d0

Signed-off-by: hany <hany.alsamman@gmail.com>

Conflicts:
	res/values/probam_strings.xml
	src/com/android/settings/SecuritySettings.java

Conflicts:
	res/values/liquid_strings.xml
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
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
Live Volume Steps [2/2]

Change-Id: Ibe9cf2772890c1fbef55ab6cc78059a39c514d7d

Conflicts:
	res/values/probam_arrays.xml
	res/values/probam_strings.xml
[2/2] OmniGears: Upgrade network traffic meter

*Implements list preferences where applicable to simplify the settings
*Add the ability to track Upstream, Downstream, or both
*Add the option to change the frequency with which it updates

PS3: add a config to disable network traffic meter
PS6: Update strings and check if stats are supported automatically

Base: https://gerrit.omnirom.org/#/c/5129/

PS8
use TrafficStats.UNSUPPORTED constant
use value as summary for list preference

PS10
use this to cleanup some of the other settings nor now

Change-Id: I778d981fb7a57d07127608f99d45936a55ae4898
Status bar double tap screen to sleep option

Conflicts:
	res/values/liquid_strings.xml
Settings: status bar notification count (2/2)

credit: burnsra & rmcc (cm)
Settings: status bar signal text style (2/2)

credit: burnsra & rmcc (cm)
Consolidate and organize lock screen settings
Disable warning dialog for navbar and pie
LockScreen: allow long-press actions from hardware keys (2/2)

Allow following actions with button long-presses on lockscreen:
- toggle flashlight (if available)
- play/pause/next/previous track selection
- toggle silent mode

Allow customizing of back, menu, and home buttons. Search
button events are completely ignored on the lockscreen.

Auto-detect hardware keys, only show appropriate menu
options based on the actual hardware keys available on the
device (or completely hide if there are no hardware keys).

Based largely on Danny Baumann's work from gingerbread.

Ported from CM10
Change-Id: I36ea5eb7e93d68de872536dc6d7e93f99ba1621f

Keyguard: Fix for home wake/unlock
sometimes device is waking and unlocking during the same keypress.
Change-Id: I72ea7611d39aac0cd03dfd5aa7036aeef7600140

Use sticky broadcast to convey torch state (1/2).
It doesn't really make sense to store the (non-persistent) state of the
torch in a (persistent) setting. As the torch is sending a broadcast
anyway, make that broadcast sticky and use it to convey the state.

Also unify the torch constants (actions, extras, activity names) at a
common place.
Change-Id: If845bef27cc79990794aa748dce18cfea3bac1f5

Fix Home/Menu/Back keys' unlock
Change-Id: Ibd3842b6ad8e037a2a9f8eb581e7c55900017b0f

LockScreen: allow hardware key longpress to put device to sleep
Change-Id: I54260e21c462bcabd9b6383e22f44d644630b4d3

settings: Deprecate has_led_flash, move to framework.
 * We need this to configure default tiles in SystemUI so move it.
 * Leave the old one in place so we don't kill every device.
Change-Id: I883f9595f74ab52c8c8152e0105400aaefff4afe

LockScreen: allow hardware key longpress to put device to sleep

Change-Id: I251e72cda94f88de3715d818ba62e796e3b2ccd0

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java

Conflicts:
	res/values/liquid_strings.xml

Conflicts:
	res/values/liquid_strings.xml
PEEK [2/2]

Add ability to switch peek on or off.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Change-Id: I1943221aa867099aeed001f3ff54ab83def90391

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

Conflicts:
	res/values/liquid_strings.xml

Conflicts:
	src/com/android/settings/liquid/LockscreenSettings.java
Gesture Lockscreen [2/2]

Change-Id: If5bb620cbc69fc8771e2b6211a2daf78bc50a995

Conflicts:
	res/values/liquid_integers.xml
	res/values/liquid_strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/SecuritySettings.java

Conflicts:
	res/values/liquid_strings.xml

Conflicts:
	res/values/liquid_strings.xml

Conflicts:
	res/values/liquid_strings.xml
Remove hardware buttons when device has none