Refactoring some animation code

Change-Id: If78b071c4fd5ac2c06d6d8ed0abaee7787273f28
3 files changed