Settings - Forward Port: Add Camera sound toggle [2/3]

Change-Id: I3ed04229c51d578b874328297eac5e9e255f51f0
Signed-off-by: STELIX <ssspinni@gmail.com>
Settings - Add volume rocker control (wake up) [2/2]

Change-Id: I4ddf4a792f3512716bb876ded964ae37f6076e83

Conflicts:
	res/values/slim_strings.xml
	src/com/android/settings/DisplaySettings.java
Option to use volume keys to control media volume anytime [2/2]

The volume keys control the Media volume rather than the Ringer
hence removing the issue of accidentaly changing the Ringer volume.

Credits: Pawitp

Change-Id: Ic0a1c04ae41eac65e9535d6de5f11c0456730315
Signed-off-by: STELIX <ssspinni@gmail.com>
Revert "Settings - PowerManager: Don't wake up device when charger is plugged/unplugged (2/2)"

This reverts commit a43fb86fbdf29d3846190c1011b8a8a3fd975cb8.

Change-Id: Ibf964fe6fe30b6c78446ba1a36d00d494d6c05ad
Signed-off-by: STELIX <ssspinni@gmail.com>