deskclock: split alarm settings into 2 lines for portrait phone devices

Patchset 2: Fix sw600dp layout
            Tweak margins

Change-Id: Ia9566332d2c19c990cf44fcc8d8f23f18535b0ae
JIRA: CYAN-3273
Issue: https://jira.cyanogenmod.org/browse/CYAN-3273
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge branch "cm-11.0" into kylin