diff options
| author | 2011-10-24 13:19:55 -0700 | |
|---|---|---|
| committer | 2011-10-24 13:19:55 -0700 | |
| commit | c9c417c85d08074e5ececd5c74db1364e9c097c2 (patch) | |
| tree | d2bfa24e53c107f4fc3019e628554f461f889344 | |
| parent | b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee (diff) | |
| parent | f8b9a4751e6d0721804931aa39545e3741ff5013 (diff) | |
Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
| -rw-r--r-- | core/java/com/android/internal/policy/IFaceLockCallback.aidl | 1 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/com/android/internal/policy/IFaceLockCallback.aidl b/core/java/com/android/internal/policy/IFaceLockCallback.aidl index 25adbb6dd41a..a7b01b269509 100644 --- a/core/java/com/android/internal/policy/IFaceLockCallback.aidl +++ b/core/java/com/android/internal/policy/IFaceLockCallback.aidl @@ -22,5 +22,6 @@ oneway interface IFaceLockCallback { void unlock(); void cancel(); void reportFailedAttempt(); + void exposeFallback(); void pokeWakelock(); } diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index b4db01d424e1..f6ec4140bf43 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -1375,6 +1375,13 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler mKeyguardScreenCallback.pokeWakelock(BACKUP_LOCK_TIMEOUT); } + // Removes the black area that covers the backup unlock method + @Override + public void exposeFallback() { + if (DEBUG) Log.d(TAG, "FaceLock exposeFallback()"); + hideFaceLockArea(); // Expose fallback + } + // Allows the Face Unlock service to poke the wake lock to keep the lockscreen alive @Override public void pokeWakelock() { |