Squash increasing volume for alarm commits

DeskClock: Add increasing volume option for alarm clocks

this commit adds a checkbox preference for "increasing volume" to
alarm clocks. when checked, the alarm will start off at 10% of the
system-wide alarm volume and slowly increase to 100% over the
course of a minute.

Original author for jb is Austen Dicken<cvpcsm@gmail.com>
jb-mr1 porters Davor Bertovic (LorD ClockaN) and maxwen

Change-Id: Ic097e344ed1570602f17f774faed7b612d47be73

Conflicts:
	src/com/android/deskclock/AlarmKlaxon.java

Fix a number of issues introduced with the increasing volume setting

- Fix coding style
- Fix alarm layout
- Don't increase volume to levels higher than set in the system
- If increasing volume is enabled and alarm volume is set to 0, don't
  play alarm
- Don't randomly change log class usage

Change-Id: Ib98d82e361e83a76f08550f3b74df0c6270645a8

Conflicts:
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fr/strings.xml
	res/values-hu/strings.xml
	res/values-pt/strings.xml
	res/values-ru/strings.xml
	src/com/android/deskclock/AlarmKlaxon.java

Fix layout issues with increasing volume option.

- Ellipsize 'increasing volume' check box so even long strings aren't
  wrapped to two lines
- Adjust margins so they're consistent with the day buttons right above

Change-Id: Icfdefa837e84ff7db51376ca1d938dc1876f8da3

Fix NullPointerException when using vibrate-only alarms.

mAudioManager wasn't initialized in that case.

Fixes issue CYAN-376.

Change-Id: I70b3bc1f89498c3407980f512b09c3449969e733