Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "FaceLock is now closed if emergency dial button is pressed"

Browse Source
This commit is contained in:
Brian Colonna
2011-09-26 06:03:02 -07:00
committed by Android (Google) Code Review
parent b75fd7ad4e eef1ae1d91
commit 0e86bc0788
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,6 +114,10 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
private final int MSG_SHOW_FACELOCK_AREA_VIEW = 0; private final int MSG_SHOW_FACELOCK_AREA_VIEW = 0;
private final int MSG_HIDE_FACELOCK_AREA_VIEW = 1; private final int MSG_HIDE_FACELOCK_AREA_VIEW = 1;
// Long enough to stay black while dialer comes up
// Short enough to not be black if the user goes back immediately
private final int FACELOCK_VIEW_AREA_EMERGENCY_HIDE_TIMEOUT = 1000;
/** /**
* The current {@link KeyguardScreen} will use this to communicate back to us. * The current {@link KeyguardScreen} will use this to communicate back to us.
*/ */
@@ -311,6 +315,13 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
} }
public void takeEmergencyCallAction() { public void takeEmergencyCallAction() {
// FaceLock must be stopped if it is running when emergency call is pressed
stopAndUnbindFromFaceLock();
// Delay hiding FaceLock area so unlock doesn't display while dialer is coming up
mHandler.sendEmptyMessageDelayed(MSG_HIDE_FACELOCK_AREA_VIEW,
FACELOCK_VIEW_AREA_EMERGENCY_HIDE_TIMEOUT);
pokeWakelock(EMERGENCY_CALL_TIMEOUT); pokeWakelock(EMERGENCY_CALL_TIMEOUT);
if (TelephonyManager.getDefault().getCallState() if (TelephonyManager.getDefault().getCallState()
== TelephonyManager.CALL_STATE_OFFHOOK) { == TelephonyManager.CALL_STATE_OFFHOOK) {