drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing alarm clock bug"

Browse Source
This commit is contained in:
Steven Ross
2011-10-07 14:36:25 -07:00
committed by Android (Google) Code Review
parent e47b89cabe 9c2df26179
commit 705a6642c4
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
View File

@ -526,11 +526,23 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
if (mUpdateMonitor.getPhoneState() == TelephonyManager.CALL_STATE_IDLE if (mUpdateMonitor.getPhoneState() == TelephonyManager.CALL_STATE_IDLE
&& transportInvisible) { && transportInvisible) {
bindToFaceLock(); 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 { } else {
mHandler.sendEmptyMessage(MSG_HIDE_FACELOCK_AREA_VIEW); 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 @Override
public void show() { public void show() {
if (mMode == Mode.LockScreen) { 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 //We need to stop faceunlock when a phonecall comes in
@Override @Override
public void onPhoneStateChanged(int phoneState) { 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 @Override