Pocketmode: fix my derp

Conflicts:
	src/com/android/settings/candykat/LockscreenNotifications.java

 Author:    Darescu Ionut <ionut.darescu@gmail.com>
Lockscreen: See through (2/2)

Add the ability to see through lockscreen.
Adapted to kitkat from jellybean by @BigBrother1984

Signed-off-by: D4rKn3sSyS <jesdga95@gmail.com>
Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

PS2:

* Indenting and fix of the LOCKSCREEN_SEE_THROUGH variable check.

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

PS3:

* Add see through checkbox to security_settings_chooser.xml, reflects the security_settings_lockscreen.xml.

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

PS4:

* Made the option available with every lock mode (PIN, Password etc.) cause it works with every mode now.
* Update description with better one.

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

PS5:

* Make description more like aosp strings.

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

Change-Id: Ife993ffe0833be98fe582146fc071f339445bbc5

Conflicts:
	res/values/liquid_strings.xml
	res/xml/lockscreen_style.xml
	src/com/android/settings/slim/LockscreenStyle.java

 Author:    BigBrother1984 <stevewatersy@gmail.com>
[2/2] OmniGears: Lockscreen blur enhancements

Adds an option to set blur intensity

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

Change-Id: Ife0941c00ebf1cbfc5804a059d337cf4e8528666

Conflicts:
	res/values/liquid_strings.xml
	res/xml/lockscreen_style.xml
	src/com/android/settings/slim/LockscreenStyle.java

 Author:    UtkarshGupta <utkarsh.eminem@gmail.com>
Revert "[2/2] OmniGears: Lockscreen blur enhancements"

This reverts commit d3a51e2695f850b912bf0ea770a250ac59542047.
this too

This reverts commit 8b002d4d42931b5bf653d82399e0acdefbee65a4.
Settings: translation - RU

If1459085628fecd8875cca51609b6bc7efbf1cbe

Change-Id: Id8fd20d0d5ec4c7db7b66f7c902ba948bed0364d
Settings: ES translations

Change-Id: Ib97a7837e471b9004f5945e432124afd975fe63c
Settings: Show heads up at the bottom of the screen (2/2)

Due of user requests and indeed especially on hw key devices for a better
workflow we add an option to show heads up notifications on the bottom instead
of the top.

Animation we leave as is due that if it slide from the bottom into the screen it happens
to often that the user accidentaly interacts with it. If it comes from the top of the
container we add, the user has enough time to realize it. Sometimes a ms can make a big difference.

Change-Id: Ieab601df1dc4fa5350fe4b9e4952198eb8e2d788

Conflicts:
	res/values/slim_strings.xml
	res/xml/notification_drawer_qs_settings.xml
	src/com/android/settings/slim/NotificationDrawerQsSettings.java

 Author:    Lars Greiss <kufikugel@googlemail.com>
Settings: translation - RU

Ieab601df1dc4fa5350fe4b9e4952198eb8e2d788

Change-Id: I444f7ee1100df293590cae06b2ae6bdc49921800
Settings: italian translation

Change-Id: If8120d06ee619f0a5f7c03b9781d4b518b97e238
Settings: add new slim actions

add central strings and array for it

Change-Id: I68b2a5176fd0106c10c533242f5b41d5935c9e0a
fix a typo in DE-translation

Change-Id: I54a746877a0b6dd43aba89e750b6b0bc789d4958
Settings: allow device trees to invoke custom display settings

in this case gesture control settings.

Intent used: com.slim.action.LAUNCH_SCREEN_OFF_GESTURE_SETTINGS

Change-Id: I82f5a8a4075f109419b08014ad2d723bf2f54402

Conflicts:
	res/values/slim_strings.xml
	src/com/android/settings/DisplaySettings.java

 Author:    Lars Greiss <kufikugel@googlemail.com>
Settings: Slimrecents background color && transparency [1/2]

Allow user to specify background color and transparency level for the slimrecents panel.

Change-Id: I6771a5b700b541e630c6d83e4427030fa83d34ea

Conflicts:
	res/values/liquid_strings.xml
	src/com/android/settings/liquid/RecentPanelSettings.java

 Author:    dankoman <dankoman30@gmail.com>
remove unneeded dependency