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
Framework : Fix proximity wakeup reference

Change-Id: Ia40ca6fbf6e37fbb3996f2384f725c30b88c2131
core: Fix permission string

Should always start with lowercase

Change-Id: I5ab97b8a6ca67c4d2460f606f09b4bed8c299401
Filter spam notifications

Change-Id: Ibf2377cd7491c7e0e9e9c9657e9e65eef1876ee3

Conflicts:
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/menu/notification_popup_menu.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	services/java/com/android/server/NotificationManagerService.java
Make incoming call screen style configurable (1/3)

Change-Id: I12e108e11afcc87cd0ed717dbc6f8a2a2c0f1743
Themes: Whitelist animations

Change-Id: I981a8e4741cf03d8649bc4828e597d1a7035e080
Load original drawable if cached icon throws NotFoundException

If for some reason we get a NotFoundException while trying to retrieve
a cached icon we will attempt to load the original.

Change-Id: I36a708d3e653fed12e88fe93c6d0a7f8e46726c9
WallpaperCropper: fix lockscreen wallpaper "Set wallpaper" string

The string is wrong and does not reflect the correct action the user is
about to apply.

Change-Id: I91eba87a38546563d6cf88138a0ed07219ec794f
Signed-off-by: Roman Birg <roman@cyngn.com>
Be sure to shutdown the proximity sensor after display wake

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

Change-Id: I1768f13cb48c3e056d0e137642690fc3d650c4ab
derp @71adbd98ed @aec7292d1a

add some missing lines @ProximityWake and @Filter spam notifications
Merge branch 'android-4.4' of https://github.com/AOSB/android_frameworks_base into aosb-kk