Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e23bf01 authored by Brian Colonna's avatar Brian Colonna Committed by Android Git Automerger
Browse files

am c9c417c8: Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0 

* commit 'c9c417c8':
  Added callback to allow Face Unlock to hide black area
parents 77847245 c9c417c8

core/java/com/android/internal/policy/IFaceLockCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -22,5 +22,6 @@ oneway interface IFaceLockCallback { 
    void unlock();

    void cancel();

    void reportFailedAttempt();

    void exposeFallback();

    void pokeWakelock();

}

policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java

+7 −0
Original line number Diff line number Diff line
@@ -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() {