tree 99e459673619d59d82dd4b9015d69280482b0ed0
parent 554069ee8c3a0c06d0849d198325eda9c0128097
parent 5537dc218234d5e7e27691ead3f22b9fbe73a36e
author Jim Miller <jaggies@google.com> 1381460830 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381460830 -0700

am 5537dc21: am bea75db9: 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 ch

* commit '5537dc218234d5e7e27691ead3f22b9fbe73a36e':
  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.