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

Commit 9c2df261 authored by Steven Ross's avatar Steven Ross
Browse files

Fixing alarm clock bug

The alarm clock doesn't actually hide the view until AFTER Facelock starts
hence the need to kill Facelock after it has started when the even is caught
Also fixing phone black box background in case the user cancels the call quickly

Also eliminating blackscreen after 4s for multiple reasons
so people can login if lockscreen locks up
also so cancel fade is to the backup lock

Change-Id: I8162ff67453038559f289408f4f0d452d4f79ab3
parent 17f25410
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -526,11 +526,23 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
        if (mUpdateMonitor.getPhoneState() == TelephonyManager.CALL_STATE_IDLE
                && transportInvisible) {
            bindToFaceLock();
            //Eliminate the black background so that the lockpattern will be visible
            //If FaceUnlock is cancelled
            mHandler.sendEmptyMessageDelayed(MSG_HIDE_FACELOCK_AREA_VIEW, 4000);
        } else {
            mHandler.sendEmptyMessage(MSG_HIDE_FACELOCK_AREA_VIEW);
        }
    }

    /** Unbind from facelock if something covers this window (such as an alarm) */
    @Override
    public void onWindowFocusChanged (boolean hasWindowFocus) {
        if(!hasWindowFocus) {
            stopAndUnbindFromFaceLock();
            mHandler.sendEmptyMessage(MSG_HIDE_FACELOCK_AREA_VIEW);
        }
    }

    @Override
    public void show() {
        if (mMode == Mode.LockScreen) {
@@ -607,7 +619,10 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
    //We need to stop faceunlock when a phonecall comes in
    @Override
    public void onPhoneStateChanged(int phoneState) {
        if(phoneState == TelephonyManager.CALL_STATE_RINGING) stopAndUnbindFromFaceLock();
        if(phoneState == TelephonyManager.CALL_STATE_RINGING) {
            stopAndUnbindFromFaceLock();
            mHandler.sendEmptyMessage(MSG_HIDE_FACELOCK_AREA_VIEW);
        }
    }

    @Override