Revert "DeskClock: fix alarm ringtone layout issue"

This reverts commit bd128764f769ccd15c90c28f7166f01141bd54a4.
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