SystemUI: Correct 'Cid'

Change-Id: I0ab7a103521890115088eb1557e345a86caf9095
CidBean: Display CyanogenMod version

Patch Set 1:    * initial release

Patch Set 2:    * get CM version from build.prop

Patch Set 3:    * code cleanup

Before: http://goo.gl/Jizyh
After:  http://goo.gl/EjtJY

Change-Id: Iadedbd7365498277d8afc51d0fe74b6cd105c448
Framework: Add Advanced reboot (2 of 2)

This commit responds to a setting in Development settings for including
options in the power menu for rebooting into recovery or bootloader. It
is defauled to off.

When enabled, the Advanced reboot options will only be available once the
device is unlocked.

Change-Id: I675f31de1f82c344c7923e953fd4a6e26dd036da
Fix the build

Fix a build error caused by this http://review.cyanogenmod.org/#/c/32038/  commit.

Change-Id: I83df6bf0e54160b3fcd755e7b3077d10391dbaf2
Merge "Framework: Add Advanced reboot (2 of 2)" into cm-10.1
Feature : Volume adjust sound preference 1/2

This patch allows the users to choose if they want the audible tone when adjusting the volume

The new preference is in
Settings | Sound
    Volume adjust sound
        Play sound when adjusting volume with hard keys
The Checkbox is defaulted to ON (1 in defaults.xml)

Look for 2/2 for the Settings, Sound Panel Change

Change-Id: I705c23065706317760ba60efc1a71f3ba6082bbd
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts (cleaned up)::
	core/java/com/android/internal/app/PlatLogoActivity.java
	services/java/com/android/server/power/ShutdownThread.java

Change-Id: Ia9300753e14f8fa0575b5a644db589eed7a24b4d