ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Conflicts:
	core/java/android/os/IPowerManager.aidl
	services/java/com/android/server/power/PowerManagerService.java
Be sure to shutdown the proximity sensor after display wake

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

Change-Id: I1768f13cb48c3e056d0e137642690fc3d650c4ab
Proximity : Check proximity flags only if from native

Change-Id: Id1be619e638de6a45252d8390eab6e38bd5de5a7
PowerManager : Make proximity check opt-in

Change-Id: I7cf64a82530da2e655018e43683ba7a5584d54f8
Framework : Fix proximity wakeup reference

Change-Id: Ia40ca6fbf6e37fbb3996f2384f725c30b88c2131
Dual panel for settings (1/2)

Change-Id: Idb4870e764404b0f4d070ebcd36c7e519388abfc

Conflicts:
	core/java/android/provider/Settings.java
Revert "AudioManager: make swap volume buttons RTL aware"

This reverts commit 1539c4be939fb257abffd57c944b91a3177015dc.
Revert "Swap volume buttons when the screen is rotated by 90 or 180 degrees"

This reverts commit 50e085ce9bde9a77d94492d1d46d5af53cb9ddb9.
Swap volume buttons when the screen is rotated (1/2)

See: http://review.cyanogenmod.org/#/c/14530/

Patch Set 8: Invert the orientation interpretations on tablets

Change-Id: I201febc2827e6fbd347cb0e3f8d3347ad1bc487b

Conflicts:
	media/java/android/media/AudioManager.java
Re-implement orientation aware volume buttons at lower level

Rework of http://review.cyanogenmod.org/31979

Fixes:
1. inconsistent volume button behaviour depending on app in use
   - the buttons not swapped for some NDK/OPENSL ES apps like
   e.g. MX Player
2. the function of volume buttons on external input devices like BT/USB
   keyboards should not be affected by the main unit orientation

This commit finishes http://review.cyanogenmod.org/18273 - use of system
property has been replaced with config push via JNI as suggested during
the original review.

Patch Set 2: Circumvent the need for "keyboard.orientationAware = 1" idc
Patch Set 3: Don't leak implementation details outside InputReader

Change-Id: I19cc60cb0acb0005ab13fa069f52e3d468d694e7

Conflicts:
	media/java/android/media/AudioManager.java
	services/java/com/android/server/input/InputManagerService.java
Force Expanded Notifications (1/2)
This will force expanded notifications for all apps that support
expanded notifications

Change-Id: I4b24026343ca92368fcdba713fb884cc220afaf0
AudioService: Reduce volume to safe level when headset is connected (2/2)

This is a safety feature for users who opt to raise volume above the designated
safe level while using a headset.

Currently when a user does this they are provided with no protection against
dangerously high volume levels until the next time the headset volume warning
is displayed.

This patch adds an optional feature to ensure volume is no higher than the safe
level every time a headset is connected.

Change-Id: Idaa9cc9549bc3c6278e1e44490433c5366c29c16
Over scroll effects [1/2]

Change-Id: I4cc67715f8f3bc67674782f08b9e363ee0e8ac9e
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	core/java/android/provider/Settings.java
Derp

Change-Id: Iedfd9f8796b0fd5a273ce5b4e0d93ca45ca1ead9