Tweaked animation timings

Also improved detection of shake to switch between battery and time display