fixes
Revert "Revert "ProximityWake : Add support for checking proximity when waking device [1/2]""

This reverts commit 032836ebfd6e2ec9a9522d636322363c9c866f19.
Revert "Revert "Revert "ProximityWake : Add support for checking proximity when waking device [1/2]"""

This reverts commit 302d1c2d93b5e01e593d9c987d8e85197f254009.
SystemUI: show statusbar icon if quiet hours is active

Reflects the 3 active modes we provide as status bar icon, similar to
android L.

Change-Id: Ic32242b0843f44de72174ee768ef04ee0f4535aa
Fix lock screen notifications proximity sensors

Fixes pocket mode and wake on notification options

Thanks Steve Spencer :)

Change-Id: I3e7ee05be12c86ce31c2db4d8150c0f5b3c3dadc

Conflicts:
	packages/Keyguard/src/com/android/keyguard/NotificationViewManager.java
ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Conflicts:
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/PowerManagerService.java

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/PowerManagerService.java
Framework : Fix proximity wakeup reference

Change-Id: Ia40ca6fbf6e37fbb3996f2384f725c30b88c2131
frameworks/base: add SmartCover support

config part:

https://gerrit.nameless-rom.org/#/c/7597/

Change-Id: I1e196eeffd0b83d7445c2394648649939b67c6f4

Conflicts:
	packages/Keyguard/res/values-af/cm_strings.xml
	packages/Keyguard/res/values-ar/cm_strings.xml
	packages/Keyguard/res/values-ca/cm_strings.xml
	packages/Keyguard/res/values-cs/cm_strings.xml
	packages/Keyguard/res/values-da/cm_strings.xml
	packages/Keyguard/res/values-de/cm_strings.xml
	packages/Keyguard/res/values-el/cm_strings.xml
	packages/Keyguard/res/values-es-rXA/cm_strings.xml
	packages/Keyguard/res/values-es/cm_strings.xml
	packages/Keyguard/res/values-et/cm_strings.xml
	packages/Keyguard/res/values-fi/cm_strings.xml
	packages/Keyguard/res/values-fr/cm_strings.xml
	packages/Keyguard/res/values-hu/cm_strings.xml
	packages/Keyguard/res/values-in/cm_strings.xml
	packages/Keyguard/res/values-it/cm_strings.xml
	packages/Keyguard/res/values-iw/cm_strings.xml
	packages/Keyguard/res/values-ja/cm_strings.xml
	packages/Keyguard/res/values-ku/cm_strings.xml
	packages/Keyguard/res/values-lt/cm_strings.xml
	packages/Keyguard/res/values-nb/cm_strings.xml
	packages/Keyguard/res/values-nl/cm_strings.xml
	packages/Keyguard/res/values-pl/cm_strings.xml
	packages/Keyguard/res/values-pt-rBR/cm_strings.xml
	packages/Keyguard/res/values-pt-rPT/cm_strings.xml
	packages/Keyguard/res/values-ro/cm_strings.xml
	packages/Keyguard/res/values-ru/cm_strings.xml
	packages/Keyguard/res/values-si/cm_strings.xml
	packages/Keyguard/res/values-sk/cm_strings.xml
	packages/Keyguard/res/values-sr/cm_strings.xml
	packages/Keyguard/res/values-sv/cm_strings.xml
	packages/Keyguard/res/values-th/cm_strings.xml
	packages/Keyguard/res/values-tr/cm_strings.xml
	packages/Keyguard/res/values-uk/cm_strings.xml
	packages/Keyguard/res/values-zh-rCN/cm_strings.xml
	packages/Keyguard/res/values-zh-rHK/cm_strings.xml
	packages/Keyguard/res/values-zh-rTW/cm_strings.xml
	packages/Keyguard/res/values/cm_strings.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java

Conflicts:
	packages/Keyguard/res/values/mahdi_strings.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
(1/2) Frameworks: allow to enable / disable smart covers

Change-Id: I83d96696fefedc19fc3bce7265a4fcf2d4c894bc

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
add support for Smart Cover HAL

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
smart cover: show it when closing display while on keyguard

currently if you are on the keyguard and close the smart cover, the display
will turn off.

only turn it off, if we are not on the keyguard.
screen turns off after the default smart cover timeout

Change-Id: I889dd04b2b5223c3f239f41cc3bf097541c0497e
Smart Cover: update appearance

d38e3e5 smart cover: reduce textsize of the clock and status lines to fit better
3639d58 smart cover: change left and right padding of the content
0b74ec0 smart cover: reduce space on top
3bae23f Smart Cover: update appearance
SmartCover: fix for displaying missed calls and unread messages together

increase the size of the clock slightly
[2/2] Permit home button wake to be configurable

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
[1/2] Base: opens music app when headset is plugged
[1/2] base: Headset plug: Disable if music is active

PS6:
-I want to understand :)

Change-Id: I7ae31121b08fbf99c32bade8df4f291a99b1abaf

Conflicts:
	core/java/android/provider/Settings.java
[2/2] base: Headset: headset actions improvement

Adds "Kill app" and "Move app to front"

New logic with more actions and events

Change-Id: I58cef9112c89e4c8ec625e57bdce471f1aaf881a

Conflicts:
	core/java/com/android/internal/util/omni/TaskUtils.java
	media/java/android/media/AudioService.java

Conflicts:
	core/java/android/provider/Settings.java
	media/java/android/media/AudioService.java
AudioService: remove old headset plug code
boosthints: boost a bit while scrolling

Change-Id: I9a5489d861523cea610477e8bf1cfbf05f3ccf92
Signed-off-by: Alexander Martinz <eviscerationls@gmail.com>

Conflicts:
	core/java/android/widget/Scroller.java
CPU boost edit values