tree ff7d971bb70793dbb28d7ef80020e87c869dbc9b
parent 2c996b4b791e5f18e2c6518e8f27d3bc43aa9bc2
parent 6ae7e75876bbdf7d11e1c78d784f0eeb346e7215
author Ed Heyl <edheyl@google.com> 1351822546 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351822546 -0700

am 6ae7e758: am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev

* commit '6ae7e75876bbdf7d11e1c78d784f0eeb346e7215':
  Keyguard sliding challenge - fix overeager touch interception
  Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
  Showing message when max attempts are hit in face unlock fixes b/7306168
  Keyguard tablet/portrait fix for HUGE security views
  Cancel camera launch on screen off.
  Fix launcher flash during secure camera transition.
  Updating isShowing during onResume()
  Suppressing FUL after going to backup fixes b/7449820
  Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
  Adding a button for expanding the clock screen challenge.
  Accessibility support for the lockscreen  - phone.
  Stripping dead API related to keyguard widgets
  FUL being unsuppressed when screen turns off fixes b/7453702
  Show the keyboard less aggressively.