ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Be sure to shutdown the proximity sensor after display wake

This fixes:
http://review.cyanogenmod.org/#/c/66657/

Change-Id: I1768f13cb48c3e056d0e137642690fc3d650c4ab

PowerManager : Make proximity check opt-in

Change-Id: I7cf64a82530da2e655018e43683ba7a5584d54f8

Framework : Fix proximity wakeup reference

Change-Id: Ia40ca6fbf6e37fbb3996f2384f725c30b88c2131

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/res/res/values/symbols.xml
	services/core/java/com/android/server/power/PowerManagerService.java
Revert "SystemUI: Fix mobile data connection type hiding"

This reverts commit b2aac59c634158f0e3d78f41d36b89c5ab3bbfe2.

This is intentional and is only displayed when 2 connections
are connected at the same time.

E.g.  If you're connected to Wi-Fi with a captive portal, then
3G will remain connected and normal data connectivity will go
through 3G until you have logged in via Wi-Fi.

In that case, the correct display is Wi-Fi with "!" and mobile
with "3G".

Change-Id: I985c361a656d15b145e467542508dcef41f92df5
Fix the default value for long press on home.

In AOSP the values for this option are different than in CM.
Switch it back to the CM value for opening recent apps.

Change-Id: I0ded218659f6075aad6f178f3cd614fa10d40488
(cherry picked from commit c2f05dfb13db2a4eedaa2ffc29d2f1d4e8c6f5fa)
SystemUI: Update no SIM status bar icon again

Change-Id: I741aa199604fe6cb841d3a2b1f79802992ea4102
SystemUI: Vector drawables for data activity resources

Also include a transparent 'no activity' version to avoid
relayout requests of the ImageView because of size changes.

Change-Id: I0aee41f145b946c79c6bbb2a21954259ebd5f873
StatusBar: Update hide overlay patch with introduced vector drawable

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Runtime toggle of navbar

This adds the framework support for enabling the Navigation bar
on devices with hardware keys. It is toggled from Settings, and
depends on device-specific support for the KeyDisabler hardware
control

Change-Id: I88fecb2ca1e8613591c327a93f53909b00239cd8

wm: Nullify hardkey function assignments if enabling the navbar

This caused erroneous (and sometimes duplicate) events being generated
due to the regular key function assignments. The navbar does its
own action management, so don't try to derive from the actions
usually present in hard keys.

Change-Id: I82866e24547f8145cac4f07820ae90aacce09281

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Add PowerManager integration for button and keyboard backlight.

Allows setting button and keyboard backlight brightness as well as
button timeout.

Change-Id: I550cccafc0a8f90d6347de9261adb26b75955cc4

Conflicts:
	core/java/android/os/PowerManager.java
	core/java/android/provider/Settings.java
	services/core/java/com/android/server/power/PowerManagerService.java
SystemUI: Add missing import

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge remote-tracking branch 'legacy/lollipop' into lollipop

Conflicts:
	core/res/res/values/config.xml