tree ee899c6835ebf31ba4e04bc5604f5c147c148900
parent d9b09fa97eb47b051bbfab8cc491143198fbc9bc
parent c162dd049084681711526b219ea997aa23f5ad98
author Jim Miller <jaggies@google.com> 1381460508 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381460509 +0000

Merge "Fit and finish for camera affordance animations in keyguard - better timing - animate warp back when finger is released. - Improve on/off screen animation for warped view - Re-use existing constants for consistent timing. - Hide the challenge area when the camera page is settling. - Reduce jank when camera page starts snap transition. - Prevent warping from going to previous page - Smoothly blend between PagedView and Warp animations when scrolling starts." into klp-dev