Updating animation flow for Android